diff options
Diffstat (limited to 'TAO')
62 files changed, 6417 insertions, 570 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d4276a94f27..4399d718b1b 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,131 @@ +Fri Dec 15 20:59:49 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + This set of changes are for the support of BiDirGIOP in TAO. + + * tao/BiDirPolicy.pidl: + * tao/BiDirPolicyC.cpp: + * tao/BiDirPolicyC.h: + * tao/BiDirPolicyC.i: The generated code and the pidl file for + BiDirGIOP policy. + + * tao/BiDir_ORBInitializer.cpp: + * tao/BiDir_ORBInitializer.h: The ORB initialiser that registers + the policy factory with the PortableInterceptor. + + * tao/BiDir_PolicyFactory.cpp: + * tao/BiDir_PolicyFactory.h: The PolicyFactory implementation for + BiDirGIOP policy + + * tao/BiDir_Policy_i.cpp: + * tao/BiDir_Policy_i.h: + * tao/BiDir_Policy_i.inl: The actual policy implementation for + BiDirGIOP policy + + * tao/Connection_Descriptor_Interface.h: + * tao/Connection_Descriptor_Interface.inl: Added a flag to + indicate a BiDirectional connection. Provided a method to set + the flag if the connection is bidirectional. + + * tao/Connection_Handler.cpp: + * tao/Connection_Handler.h: Added a method recache_handler + (). This method purges the previous entry and caches itself with + new properties. + + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: Added a method + is_ready_for_bidirectional (). This method checks whether the + messaging object is ready for bidirectional connections. This is + done by actually delegating to the generator and parser class. + + * tao/GIOP_Message_Generator_Parser.cpp: + * tao/GIOP_Message_Generator_Parser.h: Implementation for + is_ready_for_bidirectional (). + + * tao/GIOP_Message_Generator_Parser_12.cpp: + * tao/GIOP_Message_Generator_Parser_12.h: Other than the + implementation of is_ready_for_bidirectional () added methods + check_bidirectional_context () and process_bidirectional_context + (). These methods as the name implies, checks whether there is a + bidirectional context info in the request that came in. + + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: Implementation for + is_ready_for_bidirectional (). + + * tao/IIOP.pidl: + * tao/IIOPC.cpp: + * tao/IIOPC.h: + * tao/IIOPC.i: Generated code for IIOP module that has the + definition for ListenPointList that needs to be sent with the + service context to the server. + + * tao/IIOP_Acceptor.h: + * tao/IIOP_Acceptor.i: Added a method endpoints () that returns + the array of endpoints on which the acceptor is listening on. + + * tao/IIOP_Connection_Handler.cpp: + * tao/IIOP_Connection_Handler.h: Added a method, + process_listen_point_list (). This method finds out the port and + host for which the connection needs to be used and recaches the + handle with this new endpoint specification. + + * tao/IIOP_Transport.cpp: + * tao/IIOP_Transport.h: Added the following methods + tear_listen_point_list (), set_bidir_context_info () and + get_listen_point (). The method tear_listen_point_list () + extracts the ListenPointList from the CDR stream of the seervice + context. It then passes that information to the connection + handler. The method set_bidir_context_info () sets the service + context information that needs to be sent to + server. get_listen_point () gets the list of endpoints on the + same interface on which the clients connection is + established. Added a flag to indicate that the BiDirContext info + has already been sent on the connection. + + * tao/Invocation.cpp: Left some comments for RT folks. + + * tao/ORB.cpp: Registered the BiDirORB initializer with the + PortableInterceptor. + + * tao/ORB_Core.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.i: Added a a flag bidir_giop_policy () to indicate + that BiDir GIOP policy has been set. + + * tao/Pluggable.cpp: + * tao/Pluggable.h: Added a tear_listen_point_list () as a virtual + method. + + * tao/Pluggable_Messaging.h: Added a pure virtual method, + is_ready_for_bidirectional (). + + * tao/Service_Context.cpp: + * tao/Service_Context.h: + * tao/Service_Context.inl: A new class that would do the parsing, + encoding, decoding and addition of contexts to the service + context list. This class introduces quite a few changes for the + RT folks. + + * tao/TAO_Server_Request.cpp: + * tao/TAO_Server_Request.h: + * tao/TAO_Server_Request.i: Changed the reference of a service + context list to TAO_Service_Context. Have left the old methods + that return service_context_list as such so that we can clean up + the stuff. + + * tao/corba.h: Added the new file BiDirPolicyC.h. + + * tao/operation_details.h: + * tao/operation_details.i: Chaged the reference of + service_context_lsit to TAO_Service_Context. + + * tao/POA.cpp: Parsing of BiDirPolicy. This parsing is a bit of a + hack. It just parses the policy and sets a flag in the + ORB_Core. This needs to change when the POA gets upgraded for RT + and RT folks have agreed to do it. + + * tao/Makefile: Added new files and updated dependencies. + Fri Dec 15 15:17:12 2000 Carlos O'Ryan <coryan@uci.edu> * orbsvcs/tests/LoadBalancing/Makefile: diff --git a/TAO/tao/BiDirPolicy.pidl b/TAO/tao/BiDirPolicy.pidl new file mode 100644 index 00000000000..ae2742d05df --- /dev/null +++ b/TAO/tao/BiDirPolicy.pidl @@ -0,0 +1,44 @@ +// $Id$ + +// +// This file was used to generate the code in +// BiDirPolicy*.* The command used to generate code +// is: +// +// tao_idl \ +// -Wb,export_macro=TAO_Export \ +// -Wb,export_include="tao/TAO_Export.h" \ +// -Wb,pre_include="ace/pre.h" \ +// -Wb,post_include="ace/post.h" \ +// BiDirPolicy.pidl +// +// This is from the GIOP 1.2 spec for Bi Dir IIOP. + +#ifndef TAO_BIDIR_POLICY_PIDL +#define TAO_BIDIR_POLICY_PIDL + +#pragma prefix "omg.org" + +#include "tao/Policy.pidl" + +// Self contained module for Bi-directional GIOP policy +module BiDirPolicy +{ + typedef unsigned short BidirectionalPolicyValue; + const BidirectionalPolicyValue NORMAL = 0; + const BidirectionalPolicyValue BOTH = 1; + const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37; + + // @@ This has ben made local. It was not so in the spec. Any reason + // that this shouldn't be a local interface ? + local interface BidirectionalPolicy : CORBA::Policy + { + readonly attribute BidirectionalPolicyValue value; + }; +}; + + + +#pragma prefix "" + +#endif /* TAO_BIDIR_POLICY_PIDL*/ diff --git a/TAO/tao/BiDirPolicyC.cpp b/TAO/tao/BiDirPolicyC.cpp new file mode 100644 index 00000000000..0ad66a3c920 --- /dev/null +++ b/TAO/tao/BiDirPolicyC.cpp @@ -0,0 +1,140 @@ +// -*- 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 + +#include "BiDirPolicyC.h" + +#if !defined (__ACE_INLINE__) +#include "BiDirPolicyC.i" +#endif /* !defined INLINE */ + +static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicyValue[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x42694469), ACE_NTOHL (0x72506f6c), ACE_NTOHL (0x6963792f), ACE_NTOHL (0x42696469), ACE_NTOHL (0x72656374), ACE_NTOHL (0x696f6e61), ACE_NTOHL (0x6c506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:BiDirPolicy/BidirectionalPolicyValue:1.0 + 25, ACE_NTOHL (0x42696469), ACE_NTOHL (0x72656374), ACE_NTOHL (0x696f6e61), ACE_NTOHL (0x6c506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = BidirectionalPolicyValue + CORBA::tk_ushort, + +}; +static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue (CORBA::tk_alias, sizeof (_oc_BiDirPolicy_BidirectionalPolicyValue), (char *) &_oc_BiDirPolicy_BidirectionalPolicyValue, 0, sizeof (BiDirPolicy::BidirectionalPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (BiDirPolicy) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BidirectionalPolicyValue, &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::UShort) +TAO_NAMESPACE_BEGIN (BiDirPolicy) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, NORMAL, 0U) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::UShort) +TAO_NAMESPACE_BEGIN (BiDirPolicy) +TAO_NAMESPACE_DEFINE (const CORBA::UShort, BOTH, 1U) +TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::ULong) +TAO_NAMESPACE_BEGIN (BiDirPolicy) +TAO_NAMESPACE_DEFINE (const CORBA::ULong, BIDIRECTIONAL_POLICY_TYPE, 37U) +TAO_NAMESPACE_END + +// default constructor +BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy () +{ + } + +// destructor +BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void) +{} + +BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV + ) +{ + return BidirectionalPolicy::_unchecked_narrow (obj, ACE_TRY_ENV); +} + +BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment & + ) +{ + if (CORBA::is_nil (obj)) + return BidirectionalPolicy::_nil (); + return + ACE_reinterpret_cast + ( + BidirectionalPolicy_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &BidirectionalPolicy::_narrow + ) + ) + ); +} + +BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) +{ + if (!CORBA::is_nil (obj)) + obj->_add_ref (); + return obj; +} + +void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type) +{ + void *retv = 0; + if (type == ACE_reinterpret_cast + (ptr_arith_t, + &ACE_NESTED_CLASS (::BiDirPolicy, BidirectionalPolicy)::_narrow)) + retv = ACE_reinterpret_cast (void*, this); + else if (type == ACE_reinterpret_cast + (ptr_arith_t, + &::CORBA::Policy::_narrow)) + retv = ACE_reinterpret_cast + ( + void *, + ACE_static_cast + ( + CORBA::Policy_ptr, + 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* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) const +{ + return "IDL:BiDirPolicy/BidirectionalPolicy:1.0"; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager<BiDirPolicy::BidirectionalPolicy,BiDirPolicy::BidirectionalPolicy_var>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager<BiDirPolicy::BidirectionalPolicy,BiDirPolicy::BidirectionalPolicy_var> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/BiDirPolicyC.h b/TAO/tao/BiDirPolicyC.h new file mode 100644 index 00000000000..3951800f0d0 --- /dev/null +++ b/TAO/tao/BiDirPolicyC.h @@ -0,0 +1,206 @@ +// -*- 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 + +#ifndef _TAO_IDL_BIDIRPOLICYC_H_ +#define _TAO_IDL_BIDIRPOLICYC_H_ + +#include "ace/pre.h" +#include "tao/TAO_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/PolicyC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_NAMESPACE BiDirPolicy +{ + typedef CORBA::UShort BidirectionalPolicyValue; + typedef CORBA::UShort_out BidirectionalPolicyValue_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BidirectionalPolicyValue; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort NORMAL; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BOTH; + + TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BIDIRECTIONAL_POLICY_TYPE; + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___PTR_CH_ + + class BidirectionalPolicy; + typedef BidirectionalPolicy *BidirectionalPolicy_ptr; + +#endif /* end #if !defined */ + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CH_ + + class TAO_Export BidirectionalPolicy_var : public TAO_Base_var + { + public: + BidirectionalPolicy_var (void); // default constructor + BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {} + BidirectionalPolicy_var (const BidirectionalPolicy_var &); // copy constructor + ~BidirectionalPolicy_var (void); // destructor + + BidirectionalPolicy_var &operator= (BidirectionalPolicy_ptr); + BidirectionalPolicy_var &operator= (const BidirectionalPolicy_var &); + BidirectionalPolicy_ptr operator-> (void) const; + + operator const BidirectionalPolicy_ptr &() const; + operator BidirectionalPolicy_ptr &(); + // in, inout, out, _retn + BidirectionalPolicy_ptr in (void) const; + BidirectionalPolicy_ptr &inout (void); + BidirectionalPolicy_ptr &out (void); + BidirectionalPolicy_ptr _retn (void); + BidirectionalPolicy_ptr ptr (void) const; + + private: + BidirectionalPolicy_ptr ptr_; + // Unimplemented - prevents widening assignment. + BidirectionalPolicy_var (const TAO_Base_var &rhs); + BidirectionalPolicy_var &operator= (const TAO_Base_var &rhs); + }; + + +#endif /* end #if !defined */ + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CH_ + + class TAO_Export BidirectionalPolicy_out + { + public: + BidirectionalPolicy_out (BidirectionalPolicy_ptr &); + BidirectionalPolicy_out (BidirectionalPolicy_var &); + BidirectionalPolicy_out (const BidirectionalPolicy_out &); + BidirectionalPolicy_out &operator= (const BidirectionalPolicy_out &); + BidirectionalPolicy_out &operator= (const BidirectionalPolicy_var &); + BidirectionalPolicy_out &operator= (BidirectionalPolicy_ptr); + operator BidirectionalPolicy_ptr &(); + BidirectionalPolicy_ptr &ptr (void); + BidirectionalPolicy_ptr operator-> (void); + + private: + BidirectionalPolicy_ptr &ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_ + +class TAO_Export BidirectionalPolicy: public virtual CORBA::Policy + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef BidirectionalPolicy_ptr _ptr_type; + typedef BidirectionalPolicy_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ + + // the static operations + static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj); + static BidirectionalPolicy_ptr _narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static BidirectionalPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + static BidirectionalPolicy_ptr _nil (void) + { + return (BidirectionalPolicy_ptr)0; + } + + virtual BiDirPolicy::BidirectionalPolicyValue value ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + + protected: + BidirectionalPolicy (); + + virtual ~BidirectionalPolicy (void); + private: + BidirectionalPolicy (const BidirectionalPolicy &); + void operator= (const BidirectionalPolicy &); + }; + + +#endif /* end #if !defined */ + + +} +TAO_NAMESPACE_CLOSE // module BiDirPolicy + + +#ifndef __ACE_INLINE__ + + +#endif /* __ACE_INLINE__ */ + + +#if defined (__ACE_INLINE__) +#include "BiDirPolicyC.i" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* ifndef */ diff --git a/TAO/tao/BiDirPolicyC.i b/TAO/tao/BiDirPolicyC.i new file mode 100644 index 00000000000..09ef49ce9ca --- /dev/null +++ b/TAO/tao/BiDirPolicyC.i @@ -0,0 +1,191 @@ +// -*- 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 + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CI_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CI_ + +// ************************************************************* +// Inline operations for class BiDirPolicy::BidirectionalPolicy_var +// ************************************************************* + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void) // default constructor + : ptr_ (BidirectionalPolicy::_nil ()) +{} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy_var::ptr (void) const +{ + return this->ptr_; +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p) // copy constructor + : TAO_Base_var (), + ptr_ (BidirectionalPolicy::_duplicate (p.ptr ())) +{} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void) // destructor +{ + CORBA::release (this->ptr_); +} + +ACE_INLINE BiDirPolicy::BidirectionalPolicy_var & +BiDirPolicy::BidirectionalPolicy_var::operator= (BidirectionalPolicy_ptr p) +{ + CORBA::release (this->ptr_); + this->ptr_ = p; + return *this; +} + +ACE_INLINE BiDirPolicy::BidirectionalPolicy_var & +BiDirPolicy::BidirectionalPolicy_var::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p) +{ + if (this != &p) + { + CORBA::release (this->ptr_); + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ()); + } + return *this; +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::BidirectionalPolicy_ptr &() const // cast +{ + return this->ptr_; +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy_var::in (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr & +BiDirPolicy::BidirectionalPolicy_var::inout (void) +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr & +BiDirPolicy::BidirectionalPolicy_var::out (void) +{ + CORBA::release (this->ptr_); + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil (); + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy_var::_retn (void) +{ + // yield ownership of managed obj reference + ::BiDirPolicy::BidirectionalPolicy_ptr val = this->ptr_; + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil (); + return val; +} + + +#endif /* end #if !defined */ + + +#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CI_) +#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CI_ + +// ************************************************************* +// Inline operations for class BiDirPolicy::BidirectionalPolicy_out +// ************************************************************* + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_ptr &p) + : ptr_ (p) +{ + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil (); +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + CORBA::release (this->ptr_); + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil (); +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p) // copy constructor + : ptr_ (ACE_const_cast (BidirectionalPolicy_out &, p).ptr_) +{} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_out & +BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_out &p) +{ + this->ptr_ = ACE_const_cast (BidirectionalPolicy_out&, p).ptr_; + return *this; +} + +ACE_INLINE BiDirPolicy::BidirectionalPolicy_out & +BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p) +{ + this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ()); + return *this; +} + +ACE_INLINE BiDirPolicy::BidirectionalPolicy_out & +BiDirPolicy::BidirectionalPolicy_out::operator= (BidirectionalPolicy_ptr p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +BiDirPolicy::BidirectionalPolicy_out::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr & +BiDirPolicy::BidirectionalPolicy_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr +BiDirPolicy::BidirectionalPolicy_out::operator-> (void) +{ + return this->ptr_; +} + + +#endif /* end #if !defined */ + diff --git a/TAO/tao/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_ORBInitializer.cpp new file mode 100644 index 00000000000..5552a1f20fd --- /dev/null +++ b/TAO/tao/BiDir_ORBInitializer.cpp @@ -0,0 +1,70 @@ +// -*- C++ -*- +// +// $Id$ + +#include "tao/BiDir_ORBInitializer.h" +#include "tao/BiDir_PolicyFactory.h" +#include "tao/BiDirPolicyC.h" + +ACE_RCSID (tao, BiDir_ORBInitializer, "$Id$") + + +#include "tao/ORB_Core.h" + +void +TAO_BiDir_ORBInitializer::pre_init ( + PortableInterceptor::ORBInitInfo_ptr + TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // +} + +void +TAO_BiDir_ORBInitializer::post_init ( + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->register_policy_factories (info + TAO_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_BiDir_ORBInitializer::register_policy_factories ( + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) +{ + /// Register the BiDir policy factories. + PortableInterceptor::PolicyFactory_ptr temp_factory = + PortableInterceptor::PolicyFactory::_nil (); + PortableInterceptor::PolicyFactory_var policy_factory; + + TAO_ENV_ARG_DEFN; + + /// This policy factory is used for all BiDir related policies. + ACE_NEW_THROW_EX (temp_factory, + TAO_BiDir_PolicyFactory, + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + policy_factory = temp_factory; + + /// Bind the same policy factory to all BiDir related policy + /// types since a single policy factory is used to create each of + /// the different types of BiDir policies. + + CORBA::PolicyType type; + + type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE; + info->register_policy_factory (type, + policy_factory.in () + TAO_ENV_ARG_PARAMETER); + ACE_CHECK; + +} diff --git a/TAO/tao/BiDir_ORBInitializer.h b/TAO/tao/BiDir_ORBInitializer.h new file mode 100644 index 00000000000..c7ef454afca --- /dev/null +++ b/TAO/tao/BiDir_ORBInitializer.h @@ -0,0 +1,69 @@ +// -*- C++ -*- +// +// =================================================================== +/** + * @file BiDir_ORBInitializer.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +// =================================================================== + +#ifndef TAO_BIDIR_ORB_INITIALIZER_H +#define TAO_BIDIR_ORB_INITIALIZER_H + +#include "ace/pre.h" + +#include "tao/corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +#include "tao/PortableInterceptorC.h" +#include "tao/LocalObject.h" + +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +/// Messaging ORB initializer. +class TAO_Export TAO_BiDir_ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object +{ +public: + + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + + ///< Register Messaging policy factories. + void register_policy_factories ( + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL); + +}; + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + + + +#include "ace/post.h" + +#endif /* TAO_BIDIR_ORB_INITIALIZER_H */ diff --git a/TAO/tao/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_PolicyFactory.cpp new file mode 100644 index 00000000000..25ee6789058 --- /dev/null +++ b/TAO/tao/BiDir_PolicyFactory.cpp @@ -0,0 +1,47 @@ +// -*- C++ -*- +// +// $Id$ + +#include "tao/BiDir_PolicyFactory.h" +#include "tao/BiDirPolicyC.h" +#include "tao/BiDir_Policy_i.h" + +ACE_RCSID (tao, BiDir_PolicyFactory, "$Id$") + + + + +CORBA::Policy_ptr +TAO_BiDir_PolicyFactory::create_policy ( + CORBA::PolicyType type, + const CORBA::Any &value + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)) +{ + CORBA::Policy_ptr policy = CORBA::Policy::_nil (); + + TAO_ENV_ARG_DEFN; + + if (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE) + { + BiDirPolicy::BidirectionalPolicyValue val; + + // Extract the value from the any + value >>= val; + + ACE_NEW_THROW_EX (policy, + TAO_BidirectionalPolicy (val), + CORBA::NO_MEMORY ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + return policy; + } + + ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), + CORBA::Policy::_nil ()); +} diff --git a/TAO/tao/BiDir_PolicyFactory.h b/TAO/tao/BiDir_PolicyFactory.h new file mode 100644 index 00000000000..5a47807d1d4 --- /dev/null +++ b/TAO/tao/BiDir_PolicyFactory.h @@ -0,0 +1,58 @@ +// -*- C++ -*- +// +// =================================================================== +/** + * @file BiDir_PolicyFactory.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +// =================================================================== +#ifndef TAO_BIDIR_POLICY_FACTORY_H +#define TAO_BIDIR_POLICY_FACTORY_H + +#include "ace/pre.h" + +#include "tao/corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +#include "tao/PortableInterceptorC.h" +#include "tao/LocalObject.h" + +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +/// Policy factory for all Messaging related policies. +class TAO_Export TAO_BiDir_PolicyFactory : + public PortableInterceptor::PolicyFactory, + public TAO_Local_RefCounted_Object +{ +public: + + virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, + const CORBA::Any & value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + CORBA::PolicyError)); +}; + + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + + +#include "ace/post.h" + +#endif /* TAO_BIDIR_POLICY_FACTORY_H */ diff --git a/TAO/tao/BiDir_Policy_i.cpp b/TAO/tao/BiDir_Policy_i.cpp new file mode 100644 index 00000000000..f34cde79b85 --- /dev/null +++ b/TAO/tao/BiDir_Policy_i.cpp @@ -0,0 +1,80 @@ +// $Id$ + +#include "tao/BiDir_Policy_i.h" +#include "tao/Stub.h" +#include "tao/debug.h" + +ACE_RCSID(TAO, BiDir_Policy_i, "$Id$") + + + +#if ! defined (__ACE_INLINE__) +#include "tao/BiDir_Policy_i.inl" +#endif /* __ACE_INLINE__ */ + +TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( + const BiDirPolicy::BidirectionalPolicyValue val) + : value_ (val) +{ +} + +TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs) + : BiDirPolicy::BidirectionalPolicy (), + TAO_Local_RefCounted_Object (), + value_ (rhs.value_) +{ +} + + + +CORBA::PolicyType +TAO_BidirectionalPolicy::policy_type (CORBA_Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Future policy implementors: notice how this minimizes the + // footprint of the class. + return BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE; +} + + +TAO_BidirectionalPolicy * +TAO_BidirectionalPolicy::clone (void) const +{ + TAO_BidirectionalPolicy *copy = 0; + ACE_NEW_RETURN (copy, + TAO_BidirectionalPolicy (*this), + 0); + return copy; +} + +CORBA::Policy_ptr +TAO_BidirectionalPolicy::copy (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // Future policy implementors: notice how the following code is + // exception safe! + + TAO_BidirectionalPolicy* tmp; + ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this), + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + return tmp; +} + +void +TAO_BidirectionalPolicy::destroy (CORBA_Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ +} + + +BiDirPolicy::BidirectionalPolicyValue +TAO_BidirectionalPolicy::value ( + CORBA::Environment &) + ACE_THROW_SPEC (( + CORBA::SystemException)) +{ + return this->value_; +} diff --git a/TAO/tao/BiDir_Policy_i.h b/TAO/tao/BiDir_Policy_i.h new file mode 100644 index 00000000000..ea2351a599f --- /dev/null +++ b/TAO/tao/BiDir_Policy_i.h @@ -0,0 +1,99 @@ +/* -*- C++ -*- */ +// $Id$ +// + +// =================================================================== +/** + * @file BiDir_Policy_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +// =================================================================== + +#ifndef TAO_BIDIR_POLICY_I_H +#define TAO_BIDIR_POLICY_I_H +#include "ace/pre.h" +#include "tao/orbconf.h" + + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +#include "tao/BiDirPolicyC.h" +#include "tao/LocalObject.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +/** + * @class TAO_BidirectionalPolicy + * + * @brief Implementation of the BiDirPolicy::BidirectionalPolicy + * + * This policy controls the whether the connections established by the + * clients can be made bi-directional or not. Further, this policy + * also needs to be set by the server to use the connections + * established by the clients to send requests. + * + */ + +class TAO_Export TAO_BidirectionalPolicy + : public BiDirPolicy::BidirectionalPolicy, + public TAO_Local_RefCounted_Object +{ + +public: + + /// Constructor. + TAO_BidirectionalPolicy (const BiDirPolicy::BidirectionalPolicyValue val); + + /// Copy constructor. + TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs); + + /// Returns a copy of <this>. + virtual TAO_BidirectionalPolicy *clone (void) const; + + /// = The BiDir::BidirectionalPolicy methods + virtual BiDirPolicy::BidirectionalPolicyValue value ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + + virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + + /// The attribute + BiDirPolicy::BidirectionalPolicyValue value_; +}; + + + +#if defined (__ACE_INLINE__) +#include "tao/BiDir_Policy_i.inl" +#endif /* __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* TAO_BIDIR_POLICY_I_H */ diff --git a/TAO/tao/BiDir_Policy_i.inl b/TAO/tao/BiDir_Policy_i.inl new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/tao/BiDir_Policy_i.inl @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/tao/Connection_Descriptor_Interface.h b/TAO/tao/Connection_Descriptor_Interface.h index 8dc4cfdda3b..4abc3c5cb61 100644 --- a/TAO/tao/Connection_Descriptor_Interface.h +++ b/TAO/tao/Connection_Descriptor_Interface.h @@ -68,6 +68,9 @@ public: /// Return the underlying endpoint object TAO_Endpoint *endpoint (void); + /// Set the BiDir flag + void set_bidir_flag (CORBA::Boolean flag); + protected: /// Default Constructor @@ -80,6 +83,9 @@ protected: /// The base property of the connection ie. the peer's endpoint TAO_Endpoint *endpoint_; + /// Should the endpoint be used in either direction? + CORBA::Boolean bidir_flag_; + /// Is the endpoint allocated on the heap? If so, we will have to /// delete it when we destruct ourselves. CORBA::Boolean endpoint_from_heap_; diff --git a/TAO/tao/Connection_Descriptor_Interface.inl b/TAO/tao/Connection_Descriptor_Interface.inl index dd154f6cdc3..8b2b7a5ca1e 100644 --- a/TAO/tao/Connection_Descriptor_Interface.inl +++ b/TAO/tao/Connection_Descriptor_Interface.inl @@ -5,6 +5,7 @@ TAO_Connection_Descriptor_Interface:: TAO_Connection_Descriptor_Interface (TAO_Endpoint *endpoint, CORBA::Boolean flag) : endpoint_ (endpoint), + bidir_flag_ (0), endpoint_from_heap_ (flag) { } @@ -13,6 +14,7 @@ ACE_INLINE TAO_Connection_Descriptor_Interface:: TAO_Connection_Descriptor_Interface (void) : endpoint_ (0), + bidir_flag_ (0), endpoint_from_heap_ (0) { } @@ -23,3 +25,10 @@ TAO_Connection_Descriptor_Interface::endpoint (void) { return this->endpoint_; } + + +ACE_INLINE void +TAO_Connection_Descriptor_Interface::set_bidir_flag (CORBA::Boolean flag) +{ + this->bidir_flag_ = flag; +} diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index e25845bca72..2702a2ff655 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -53,6 +53,18 @@ TAO_Connection_Handler::make_idle (void) this->orb_core_->connection_cache ().make_idle (this->cache_map_entry_); } +int +TAO_Connection_Handler::recache_handler (TAO_Connection_Descriptor_Interface *desc) +{ + // First purge our entry + this->orb_core_->connection_cache ().purge_entry (this->cache_map_entry_); + + // Then add ourselves to the cache + return this->orb_core_->connection_cache ().cache_handler (desc, + this); +} + + int TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock, diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 5a20652833b..840c292754d 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -79,6 +79,9 @@ public: /// Make ourselves ready for use int make_idle (void); + /// recache ourselves in the cache + int recache_handler (TAO_Connection_Descriptor_Interface *); + /// Increment the reference count void incr_ref_count (void); diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 2375dd853dd..8b24988f6fc 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -62,8 +62,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -181,8 +182,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -234,6 +234,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -381,11 +383,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -503,8 +509,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -556,6 +561,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -703,6 +710,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAny_i.h DynStruct_i.h DynSequence_i.h DynEnum_i.h \ DynArray_i.h DynUnion_i.h DynUnion_i_T.h DynUnion_i_T.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -712,6 +721,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -829,8 +840,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -882,6 +892,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1029,11 +1041,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1151,8 +1167,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1204,6 +1219,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1351,6 +1368,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -1359,6 +1378,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1475,8 +1496,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1528,6 +1548,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1675,6 +1697,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -1682,6 +1706,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1799,8 +1825,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1852,6 +1877,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1999,11 +2026,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2121,8 +2152,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2174,6 +2204,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -2321,6 +2353,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -2328,6 +2362,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ $(ACE_ROOT)/ace/pre.h DynamicAny.h \ dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2445,8 +2481,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2498,6 +2533,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -2645,13 +2682,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2769,8 +2809,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2822,6 +2861,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -2969,6 +3010,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ DynamicAnyC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index 58fc6096413..a817acaa562 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -61,6 +61,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -201,6 +203,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -344,6 +348,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -382,9 +388,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - Request.inl DII_Invocation.inl \ - $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/NVList.i Request.inl \ + DII_Invocation.inl $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -497,10 +502,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp \ - DII_Reply_Dispatcher.h \ - $(ACE_ROOT)/ace/pre.h \ + DII_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -522,8 +528,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - dynamicinterface_export.h \ + $(ACE_ROOT)/ace/OS.i dynamicinterface_export.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/IOPC.h \ @@ -651,8 +656,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - Request.inl \ + $(TAO_ROOT)/tao/NVList.i Request.inl \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -765,11 +769,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i .obj/Dynamic_Adapter_Impl.o .obj/Dynamic_Adapter_Impl.so .shobj/Dynamic_Adapter_Impl.o .shobj/Dynamic_Adapter_Impl.so: Dynamic_Adapter_Impl.cpp \ - Dynamic_Adapter_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ + Dynamic_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Dynamic_Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -884,8 +889,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Request.h Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Request.h \ + Context.h Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ @@ -935,8 +940,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl Server_Request.h \ + $(TAO_ROOT)/tao/MessagingC.i Request.inl \ + Server_Request.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ @@ -946,6 +951,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ Server_Request.inl \ $(TAO_ROOT)/tao/Invocation.h \ @@ -1065,11 +1072,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/Dynamic_Implementation.o .obj/Dynamic_Implementation.so .shobj/Dynamic_Implementation.o .shobj/Dynamic_Implementation.so: Dynamic_Implementation.cpp \ - Dynamic_Implementation.h \ - $(ACE_ROOT)/ace/pre.h \ + Dynamic_Implementation.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1216,6 +1224,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ Server_Request.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1370,6 +1380,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1477,6 +1489,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1571,8 +1585,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ dynamicinterface_export.h Context.inl ExceptionList.h \ - ExceptionList.inl \ - $(TAO_ROOT)/tao/ORB.h \ + ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1623,8 +1636,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl DII_Invocation.h \ + $(TAO_ROOT)/tao/MessagingC.i Request.inl \ + DII_Invocation.h \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ @@ -1642,6 +1655,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -1670,6 +1685,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1762,8 +1779,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - Context.h dynamicinterface_export.h Context.inl \ + $(TAO_ROOT)/tao/corbafwd.i Context.h \ + dynamicinterface_export.h Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1810,9 +1827,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ - Server_Request.inl \ - $(TAO_ROOT)/tao/NVList.h \ + Server_Request.inl $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.i \ diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 44b45076d9e..3bce1bc300e 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1335,3 +1335,12 @@ TAO_GIOP_Message_Base::generate_locate_reply_header ( { return 0; } + + +int +TAO_GIOP_Message_Base::is_ready_for_bidirectional (void) +{ + // We dont really know.. So ask the enerator and parser objects that + // we know. + return this->generator_parser_->is_ready_for_bidirectional (); +} diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 6e76ebc810c..53a6ca5180c 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -184,6 +184,10 @@ private: TAO_OutputCDR & /*cdr*/, TAO_Pluggable_Reply_Params & /*params*/); + /// Is the messaging object ready for processing BiDirectional + /// request/response? + virtual int is_ready_for_bidirectional (void); + private: /// The message state. It represents the status of the messages that diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index a898e52f206..9d53560d613 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -131,6 +131,12 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( } +int +TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional (void) +{ + return 0; +} + void TAO_GIOP_Message_Generator_Parser::marshal_reply_status ( TAO_OutputCDR &output, diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 73228199d17..748841fd3d7 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -97,6 +97,9 @@ public: virtual CORBA::Octet major_version (void) = 0; virtual CORBA::Octet minor_version (void) = 0; + /// Is the messaging object ready for processing BiDirectional + /// request/response? + virtual int is_ready_for_bidirectional (void); protected: diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index d79348eb0d8..ec1e39e2851 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -12,7 +12,9 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/TAO_Server_Request.h" #include "tao/TAOC.h" - +#include "tao/Service_Context.h" +#include "tao/Pluggable.h" +#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Generator_Parser_12.inl" @@ -37,60 +39,60 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header ( // First the request id msg << opdetails.request_id (); - const CORBA::Octet response_flags = opdetails.response_flags (); + const CORBA::Octet response_flags = opdetails.response_flags (); - // Here are the Octet values for different policies - // '00000000' for SYNC_NONE - // '00000000' for SYNC_WITH_TRANSPORT - // '00000010' for SYNC_WITH_SERVER - // '00000011' for SYNC_WITH_TARGET - // '00000011' for regular two ways, but if they are invoked via a + // Here are the Octet values for different policies + // '00000000' for SYNC_NONE + // '00000000' for SYNC_WITH_TRANSPORT + // '00000010' for SYNC_WITH_SERVER + // '00000011' for SYNC_WITH_TARGET + // '00000011' for regular two ways, but if they are invoked via a // DII with INV_NO_RESPONSE flag set then we need to send '00000001' // - // We have not implemented the policy INV_NO_RESPONSE for DII. - if (response_flags == TAO_TWOWAY_RESPONSE_FLAG) - msg << CORBA::Any::from_octet (3); - // Second the response flags - // Sync scope - ignored by server if request is not oneway. + // We have not implemented the policy INV_NO_RESPONSE for DII. + if (response_flags == TAO_TWOWAY_RESPONSE_FLAG) + msg << CORBA::Any::from_octet (3); + // Second the response flags + // Sync scope - ignored by server if request is not oneway. else if (response_flags == CORBA::Octet (TAO::SYNC_NONE) || - response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) || - response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) || - response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING)) + response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) || + response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) || + response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING)) // No response required. - msg << CORBA::Any::from_octet (0); + msg << CORBA::Any::from_octet (0); else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_SERVER)) - // Return before dispatching to the servant - msg << CORBA::Any::from_octet (1); + // Return before dispatching to the servant + msg << CORBA::Any::from_octet (1); else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TARGET)) - // Return after dispatching servant. - msg << CORBA::Any::from_octet (3); + // Return after dispatching servant. + msg << CORBA::Any::from_octet (3); else - // Until more flags are defined by the OMG. + // Until more flags are defined by the OMG. return 0; // The reserved field CORBA::Octet reserved[3] = {0, 0, 0}; - msg.write_octet_array (reserved, 3); + msg.write_octet_array (reserved, 3); if (this->marshall_target_spec (spec, - msg) == 0) + msg) == 0) return 0; // Write the operation name msg.write_string (opdetails.opname_len (), - opdetails.opname ()); + opdetails.opname ()); // Write the service context list - msg << opdetails.service_info (); + msg << opdetails.service_info (); - // We align the pointer only if the operation has arguments. + // We align the pointer only if the operation has arguments. if (opdetails.argument_flag ()) { if (msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1) - return 0; + return 0; } return 1; @@ -100,7 +102,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header ( int TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header ( CORBA::ULong request_id, - TAO_Target_Specification &spec, + TAO_Target_Specification &spec, TAO_OutputCDR &msg ) { @@ -109,12 +111,12 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header ( // Write the target address if (this->marshall_target_spec (spec, - msg) == 0) + msg) == 0) return 0; // I dont think we need to align the pointer to an 8 byte boundary // here. - // We need to align the pointer + // We need to align the pointer // if (msg.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1) // return 0; @@ -348,6 +350,10 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( input >> service_info; + // Check an process if BiDir contexts are available + if (request.orb_core ()->bidir_giop_policy ()) + this->check_bidirectional_context (request); + if (input.length () > 0) { // Reset the read_ptr to an 8-byte boundary. @@ -477,6 +483,13 @@ TAO_GIOP_Message_Generator_Parser_12::minor_version (void) return (CORBA::Octet) 2; } +int +TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void) +{ + // We do support bidirectional + return 1; +} + int @@ -489,79 +502,120 @@ TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec ( { case TAO_Target_Specification::Key_Addr: { - // As this is a union send in the discriminant first - msg << GIOP::KeyAddr; - - // Get the object key - const TAO_ObjectKey *key = spec.object_key (); - if (key) - { - // Marshall in the object key - msg << *key; - } - else - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); - return 0; - } - break; + // As this is a union send in the discriminant first + msg << GIOP::KeyAddr; + + // Get the object key + const TAO_ObjectKey *key = spec.object_key (); + if (key) + { + // Marshall in the object key + msg << *key; + } + else + { + if (TAO_debug_level) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); + return 0; + } + break; } case TAO_Target_Specification::Profile_Addr: { - // As this is a union send in the discriminant first - msg << GIOP::ProfileAddr; - - // Get the profile - const IOP::TaggedProfile *pfile = spec.profile (); - - if (pfile) - { - // Marshall in the object key - msg << *pfile; - } - else - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); - return 0; - } - break; + // As this is a union send in the discriminant first + msg << GIOP::ProfileAddr; + + // Get the profile + const IOP::TaggedProfile *pfile = spec.profile (); + + if (pfile) + { + // Marshall in the object key + msg << *pfile; + } + else + { + if (TAO_debug_level) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); + return 0; + } + break; } case TAO_Target_Specification::Reference_Addr: { - // As this is a union send in the discriminant first - msg << GIOP::ReferenceAddr; - - // Get the IOR - IOP::IOR *ior; - CORBA::ULong index = spec.iop_ior (ior); - - if (ior) - { - // This is a struct IORAddressingInfo. So, marshall each - // member of the struct one after another in the order - // defined. - msg << index; - msg << *ior; - } - else - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); - return 0; - } - break; + // As this is a union send in the discriminant first + msg << GIOP::ReferenceAddr; + + // Get the IOR + IOP::IOR *ior; + CORBA::ULong index = spec.iop_ior (ior); + + if (ior) + { + // This is a struct IORAddressingInfo. So, marshall each + // member of the struct one after another in the order + // defined. + msg << index; + msg << *ior; + } + else + { + if (TAO_debug_level) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); + return 0; + } + break; } default: if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%N |%l) Unable to handle this request \n"))); return 0; } return 1; } + + +int +TAO_GIOP_Message_Generator_Parser_12::check_bidirectional_context ( + TAO_ServerRequest &request) +{ + // Check whether we have the BiDir service context info available in + // the ServiceContextList + if (request.service_context ().is_service_id (IOP::BI_DIR_IIOP) + == 1) + { + return this->process_bidir_context (request.service_context (), + request.transport ()); + } + + return 0; +} + +int +TAO_GIOP_Message_Generator_Parser_12::process_bidir_context ( + TAO_Service_Context &service_context, + TAO_Transport *transport) +{ + // Get the context info + IOP::ServiceContext context; + context.context_id = IOP::BI_DIR_IIOP; + + if (service_context.get_context (context) != 1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Context info not found \n")), + -1); + + + TAO_InputCDR cdr (ACE_reinterpret_cast + (const char*, + context.context_data.get_buffer ()), + context.context_data.length ()); + + return transport->tear_listen_point_list (cdr); + +} diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 5fa5dfa9a62..0710c2e0e63 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -28,6 +28,8 @@ #endif /* _MSC_VER */ class TAO_GIOP_Message_State; +class TAO_Service_Context; +class TAO_Transport; /** * @class TAO_GIOP_Message_Generator_Parser_12 @@ -88,14 +90,29 @@ public: virtual CORBA::Octet major_version (void); virtual CORBA::Octet minor_version (void); + /// Is the messaging object ready for processing BiDirectional + /// request/response? + virtual int is_ready_for_bidirectional (void); + private: /// Marshall the TargetSpecification - // This method may be required for other GIOP versiona coming out - // later than 1.2. We need to share this method + /// This method may be required for other GIOP versiona coming out + /// later than 1.2. We need to share this method int marshall_target_spec (TAO_Target_Specification &spec, TAO_OutputCDR &msg); + + /// Check whether we have BiDirContext info available. If available + /// delegate the responsibility on to the TAO_Transport classes to + /// initiate action. + /// Note: At somepoint this may be needed for future versions of + /// GIOP and we may have to share this + int check_bidirectional_context (TAO_ServerRequest &); + + /// Process the BiDirContext info that we have received. + int process_bidir_context (TAO_Service_Context &, + TAO_Transport *transport); }; diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index a6ab743e9a2..f6064bd4c0b 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1402,3 +1402,19 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, *id)); } } + +int +TAO_GIOP_Message_Lite::generate_locate_reply_header ( + TAO_OutputCDR & /*cdr*/, + TAO_Pluggable_Reply_Params & /*params*/) +{ + return 0; +} + + +int +TAO_GIOP_Message_Lite::is_ready_for_bidirectional (void) +{ + // No we dont support.. + return 0; +} diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index fe8f3220e10..1c1dfba8937 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -181,7 +181,11 @@ private: /// Write the locate reply header virtual int generate_locate_reply_header ( TAO_OutputCDR & /*cdr*/, - TAO_Pluggable_Reply_Params & /*params*/) { return 0;}; + TAO_Pluggable_Reply_Params & /*params*/); + + /// Is the messaging object ready for processing BiDirectional + /// request/response? + virtual int is_ready_for_bidirectional (void); private: diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl new file mode 100644 index 00000000000..01c99db6e6c --- /dev/null +++ b/TAO/tao/IIOP.pidl @@ -0,0 +1,45 @@ +// -*- IDL -*- +// +// $Id$ + +// +// This file was used to generate the code in +// IIOP*.* The command used to generate code +// is: +// +// tao_idl \ +// -Wb,export_macro=TAO_Export \ +// -Wb,export_include="tao/TAO_Export.h" \ +// -Wb,pre_include="ace/pre.h" \ +// -Wb,post_include="ace/post.h" \ +// IIOP.pidl +// +// This is from the GIOP 1.2 spec for Bi Dir IIOP. + +#ifndef TAO_IIOP_PIDL +#define TAO_IIOP_PIDL + +// This is a OMG specified IDL. When IIOP modules start getting +// complicated we may want to have them here. +#pragma prefix "omg.org" + + +module IIOP +{ + struct ListenPoint + { + string host; + unsigned short port; + }; + typedef sequence<ListenPoint> ListenPointList; + struct BiDirIIOPServiceContext + { + ListenPointList listen_points; + }; +}; + + + +#pragma prefix "" + +#endif /* TAO_IIOP_PIDL */ diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp new file mode 100644 index 00000000000..53c164dc8c1 --- /dev/null +++ b/TAO/tao/IIOPC.cpp @@ -0,0 +1,514 @@ +// -*- 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 + +#include "tao/IIOPC.h" +#include "tao/Typecode.h" +#include "tao/Any.h" + +#if !defined (__ACE_INLINE__) +#include "IIOPC.i" +#endif /* !defined INLINE */ + +static const CORBA::Long _oc_IIOP_ListenPoint[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 + 12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint + 2, // member count + 5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host + CORBA::tk_string, + 0U, // string length + 5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port + CORBA::tk_ushort, + +}; +static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint (CORBA::tk_struct, sizeof (_oc_IIOP_ListenPoint), (char *) &_oc_IIOP_ListenPoint, 0, sizeof (IIOP::ListenPoint)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (IIOP) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPoint, &_tc_TAO_tc_IIOP_ListenPoint) +TAO_NAMESPACE_END +void IIOP::ListenPoint::_tao_any_destructor (void *x) +{ + ListenPoint *tmp = ACE_static_cast (ListenPoint*,x); + delete tmp; +} + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_) +#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_ + + void + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_allocate_buffer (CORBA::ULong length) + { + IIOP::ListenPoint* tmp = 0; + tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length); + + if (this->buffer_ != 0) + { + IIOP::ListenPoint *old = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp[i] = old[i]; + + if (this->release_) + _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old); + + } + this->buffer_ = tmp; + } + + void + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void) + { + if (this->buffer_ == 0 || this->release_ == 0) + return; + + IIOP::ListenPoint *tmp = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_); + + _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp); + this->buffer_ = 0; + } + + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Dtor. + { + this->_deallocate_buffer (); + } + + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IIOP_LISTENPOINTLIST_CS_) +#define _IIOP_LISTENPOINTLIST_CS_ + +// ************************************************************* +// IIOP::ListenPointList +// ************************************************************* + +IIOP::ListenPointList::ListenPointList (void) +{} +IIOP::ListenPointList::ListenPointList (CORBA::ULong max) // uses max size + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IIOP_ListenPointList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IIOP::ListenPoint> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) +{} +IIOP::ListenPointList::ListenPointList (CORBA::ULong max, CORBA::ULong length, IIOP::ListenPoint *buffer, CORBA::Boolean release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IIOP_ListenPointList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IIOP::ListenPoint> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) +{} +IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) // copy ctor + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IIOP_ListenPointList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<IIOP::ListenPoint> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) +{} +IIOP::ListenPointList::~ListenPointList (void) // dtor +{} +void IIOP::ListenPointList::_tao_any_destructor (void *x) +{ + ListenPointList *tmp = ACE_static_cast (ListenPointList*,x); + delete tmp; +} + + +#endif /* end #if !defined */ + +static const CORBA::Long _oc_IIOP_ListenPointList[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0 + 16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400), // name = ListenPointList + CORBA::tk_sequence, // typecode kind + 116, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_struct, // typecode kind + 100, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 + 12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint + 2, // member count + 5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host + CORBA::tk_string, + 0U, // string length + 5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port + CORBA::tk_ushort, + + + 0U, + +}; +static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList (CORBA::tk_alias, sizeof (_oc_IIOP_ListenPointList), (char *) &_oc_IIOP_ListenPointList, 0, sizeof (IIOP::ListenPointList)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (IIOP) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ListenPointList, &_tc_TAO_tc_IIOP_ListenPointList) +TAO_NAMESPACE_END +static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f426944), ACE_NTOHL (0x69724949), ACE_NTOHL (0x4f505365), ACE_NTOHL (0x72766963), ACE_NTOHL (0x65436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0 + 24, ACE_NTOHL (0x42694469), ACE_NTOHL (0x7249494f), ACE_NTOHL (0x50536572), ACE_NTOHL (0x76696365), ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787400), // name = BiDirIIOPServiceContext + 1, // member count + 14, ACE_NTOHL (0x6c697374), ACE_NTOHL (0x656e5f70), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x73000000), // name = listen_points + CORBA::tk_alias, // typecode kind for typedefs + 192, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0 + 16, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400), // name = ListenPointList + CORBA::tk_sequence, // typecode kind + 116, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_struct, // typecode kind + 100, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49494f50), ACE_NTOHL (0x2f4c6973), ACE_NTOHL (0x74656e50), ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 + 12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint + 2, // member count + 5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host + CORBA::tk_string, + 0U, // string length + 5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port + CORBA::tk_ushort, + + + 0U, + + +}; +static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext (CORBA::tk_struct, sizeof (_oc_IIOP_BiDirIIOPServiceContext), (char *) &_oc_IIOP_BiDirIIOPServiceContext, 0, sizeof (IIOP::BiDirIIOPServiceContext)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (IIOP) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BiDirIIOPServiceContext, &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext) +TAO_NAMESPACE_END +void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *x) +{ + BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*,x); + delete tmp; +} + +void operator<<= (CORBA::Any &_tao_any, const IIOP::ListenPoint &_tao_elem) // copying +{ + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IIOP::_tc_ListenPoint, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); +} + +void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPoint *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IIOP::_tc_ListenPoint, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IIOP::ListenPoint::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPoint *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast(const IIOP::ListenPoint*&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + if (!type->equivalent (IIOP::_tc_ListenPoint, ACE_TRY_ENV)) // not equal + { + return 0; + } + ACE_TRY_CHECK; + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( + const IIOP::ListenPoint*, + _tao_any.value () + ); + return 1; + } + else + { + IIOP::ListenPoint *tmp; + ACE_NEW_RETURN (tmp, IIOP::ListenPoint, 0); + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + IIOP::_tc_ListenPoint, + 1, + ACE_static_cast (void *, tmp), + IIOP::ListenPoint::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + +void operator<<= ( + CORBA::Any &_tao_any, + const IIOP::ListenPointList &_tao_elem + ) // copying +{ + TAO_OutputCDR stream; + if (stream << _tao_elem) + { + _tao_any._tao_replace ( + IIOP::_tc_ListenPointList, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); + } +} + +void operator<<= (CORBA::Any &_tao_any, IIOP::ListenPointList *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IIOP::_tc_ListenPointList, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IIOP::ListenPointList::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::ListenPointList *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast( + const IIOP::ListenPointList*&, + _tao_elem + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointList *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + if (!type->equivalent (IIOP::_tc_ListenPointList, ACE_TRY_ENV)) // not equal + { + return 0; + } + ACE_TRY_CHECK; + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( + const IIOP::ListenPointList*, + _tao_any.value () + ); + return 1; + } + else + { + IIOP::ListenPointList *tmp; + ACE_NEW_RETURN (tmp, IIOP::ListenPointList, 0); + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + IIOP::_tc_ListenPointList, + 1, + ACE_static_cast (void *, tmp), + IIOP::ListenPointList::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + +void operator<<= (CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext &_tao_elem) // copying +{ + TAO_OutputCDR stream; + stream << _tao_elem; + _tao_any._tao_replace ( + IIOP::_tc_BiDirIIOPServiceContext, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); +} + +void operator<<= (CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + IIOP::_tc_BiDirIIOPServiceContext, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + IIOP::BiDirIIOPServiceContext::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IIOP::BiDirIIOPServiceContext *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast(const IIOP::BiDirIIOPServiceContext*&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPServiceContext *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + if (!type->equivalent (IIOP::_tc_BiDirIIOPServiceContext, ACE_TRY_ENV)) // not equal + { + return 0; + } + ACE_TRY_CHECK; + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( + const IIOP::BiDirIIOPServiceContext*, + _tao_any.value () + ); + return 1; + } + else + { + IIOP::BiDirIIOPServiceContext *tmp; + ACE_NEW_RETURN (tmp, IIOP::BiDirIIOPServiceContext, 0); + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + IIOP::_tc_BiDirIIOPServiceContext, + 1, + ACE_static_cast (void *, tmp), + IIOP::BiDirIIOPServiceContext::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const IIOP::ListenPointList &_tao_sequence + ) +{ + if (strm << _tao_sequence.length ()) + { + // encode all elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) + { + _tao_marshal_flag = (strm << _tao_sequence[i]); + } + return _tao_marshal_flag; + } + return 0; // error +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + IIOP::ListenPointList &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + if (strm >> _tao_seq_len) + { + // set the length of the sequence + _tao_sequence.length (_tao_seq_len); + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; + // retrieve all the elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) + { + _tao_marshal_flag = (strm >> _tao_sequence[i]); + } + return _tao_marshal_flag; + } + return 0; // error +} + diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h new file mode 100644 index 00000000000..a868d5df5a2 --- /dev/null +++ b/TAO/tao/IIOPC.h @@ -0,0 +1,392 @@ +// -*- 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 + +#ifndef TAO_IDL_IIOPC_H +#define TAO_IDL_IIOPC_H + +#include "ace/pre.h" +#include "tao/TAO_Export.h" + + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/corbafwd.h" +#include "tao/Managed_Types.h" +#include "tao/Sequence_T.h" +#include "tao/CDR.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + + +#if defined (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_NAMESPACE IIOP +{ + struct ListenPoint; + class ListenPoint_var; + + struct TAO_Export ListenPoint + { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ListenPoint_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static void _tao_any_destructor (void*); + + TAO_String_Manager host; + CORBA::UShort port; + }; + + class TAO_Export ListenPoint_var + { + public: + ListenPoint_var (void); // default constructor + ListenPoint_var (ListenPoint *); + ListenPoint_var (const ListenPoint_var &); // copy constructor + ~ListenPoint_var (void); // destructor + + ListenPoint_var &operator= (ListenPoint *); + ListenPoint_var &operator= (const ListenPoint_var &); + ListenPoint *operator-> (void); + const ListenPoint *operator-> (void) const; + + operator const ListenPoint &() const; + operator ListenPoint &(); + operator ListenPoint &() const; + operator ListenPoint *&(); // variable-size types only + + // in, inout, out, _retn + const ListenPoint &in (void) const; + ListenPoint &inout (void); + ListenPoint *&out (void); + ListenPoint *_retn (void); + ListenPoint *ptr (void) const; + + private: + ListenPoint *ptr_; + }; + + class TAO_Export ListenPoint_out + { + public: + ListenPoint_out (ListenPoint *&); + ListenPoint_out (ListenPoint_var &); + ListenPoint_out (const ListenPoint_out &); + ListenPoint_out &operator= (const ListenPoint_out &); + ListenPoint_out &operator= (ListenPoint *); + operator ListenPoint *&(); + ListenPoint *&ptr (void); + ListenPoint *operator-> (void); + + private: + ListenPoint *&ptr_; + // assignment from T_var not allowed + void operator= (const ListenPoint_var &); + }; + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPoint; + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_) +#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CH_ + + class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IIOP_ListenPointList : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + + _TAO_Unbounded_Sequence_IIOP_ListenPointList (void); // Default constructor. + _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum, + CORBA::ULong length, + ListenPoint *data, + CORBA::Boolean release = 0); + _TAO_Unbounded_Sequence_IIOP_ListenPointList (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs); + _TAO_Unbounded_Sequence_IIOP_ListenPointList &operator= (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs); + virtual ~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void); // Dtor. + // = Accessors. + ListenPoint &operator[] (CORBA::ULong i); + const ListenPoint &operator[] (CORBA::ULong i) const; + // = Static operations. + static ListenPoint *allocbuf (CORBA::ULong size); + static void freebuf (ListenPoint *buffer); + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ListenPoint *get_buffer (CORBA::Boolean orphan = 0); + const ListenPoint *get_buffer (void) const; + void replace (CORBA::ULong max, + CORBA::ULong length, + ListenPoint *data, + CORBA::Boolean release); + }; + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IIOP_LISTENPOINTLIST_CH_) +#define _IIOP_LISTENPOINTLIST_CH_ + + class ListenPointList; + class ListenPointList_var; + + // ************************************************************* + // ListenPointList + // ************************************************************* + + class TAO_Export ListenPointList : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + _TAO_Unbounded_Sequence_IIOP_ListenPointList +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<ListenPoint> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + ListenPointList (void); // default ctor + ListenPointList (CORBA::ULong max); // uses max size + ListenPointList ( + CORBA::ULong max, + CORBA::ULong length, + ListenPoint *buffer, + CORBA::Boolean release = 0 + ); + ListenPointList (const ListenPointList &); // copy ctor + ~ListenPointList (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ListenPointList_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + }; + +#endif /* end #if !defined */ + + +#if !defined (_IIOP_LISTENPOINTLIST___VAR_CH_) +#define _IIOP_LISTENPOINTLIST___VAR_CH_ + + // ************************************************************* + // class IIOP::ListenPointList_var + // ************************************************************* + + class TAO_Export ListenPointList_var + { + public: + ListenPointList_var (void); // default constructor + ListenPointList_var (ListenPointList *); + ListenPointList_var (const ListenPointList_var &); // copy constructor + ~ListenPointList_var (void); // destructor + + ListenPointList_var &operator= (ListenPointList *); + ListenPointList_var &operator= (const ListenPointList_var &); + ListenPointList *operator-> (void); + const ListenPointList *operator-> (void) const; + + operator const ListenPointList &() const; + operator ListenPointList &(); + operator ListenPointList &() const; + operator ListenPointList *&(); // variable-size base types only + + ListenPoint & operator[] (CORBA::ULong index); + const ListenPoint & operator[] (CORBA::ULong index) const; + + // in, inout, out, _retn + const ListenPointList &in (void) const; + ListenPointList &inout (void); + ListenPointList *&out (void); + ListenPointList *_retn (void); + ListenPointList *ptr (void) const; + + private: + ListenPointList *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_IIOP_LISTENPOINTLIST___OUT_CH_) +#define _IIOP_LISTENPOINTLIST___OUT_CH_ + + class TAO_Export ListenPointList_out + { + public: + ListenPointList_out (ListenPointList *&); + ListenPointList_out (ListenPointList_var &); + ListenPointList_out (const ListenPointList_out &); + ListenPointList_out &operator= (const ListenPointList_out &); + ListenPointList_out &operator= (ListenPointList *); + operator ListenPointList *&(); + ListenPointList *&ptr (void); + ListenPointList *operator-> (void); + ListenPoint & operator[] (CORBA::ULong index); + + private: + ListenPointList *&ptr_; + // assignment from T_var not allowed + void operator= (const ListenPointList_var &); + }; + + +#endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ListenPointList; + + struct BiDirIIOPServiceContext; + class BiDirIIOPServiceContext_var; + + struct TAO_Export BiDirIIOPServiceContext + { + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef BiDirIIOPServiceContext_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + static void _tao_any_destructor (void*); + + ACE_NESTED_CLASS (IIOP, ListenPointList) listen_points; + }; + + class TAO_Export BiDirIIOPServiceContext_var + { + public: + BiDirIIOPServiceContext_var (void); // default constructor + BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *); + BiDirIIOPServiceContext_var (const BiDirIIOPServiceContext_var &); // copy constructor + ~BiDirIIOPServiceContext_var (void); // destructor + + BiDirIIOPServiceContext_var &operator= (BiDirIIOPServiceContext *); + BiDirIIOPServiceContext_var &operator= (const BiDirIIOPServiceContext_var &); + BiDirIIOPServiceContext *operator-> (void); + const BiDirIIOPServiceContext *operator-> (void) const; + + operator const BiDirIIOPServiceContext &() const; + operator BiDirIIOPServiceContext &(); + operator BiDirIIOPServiceContext &() const; + operator BiDirIIOPServiceContext *&(); // variable-size types only + + // in, inout, out, _retn + const BiDirIIOPServiceContext &in (void) const; + BiDirIIOPServiceContext &inout (void); + BiDirIIOPServiceContext *&out (void); + BiDirIIOPServiceContext *_retn (void); + BiDirIIOPServiceContext *ptr (void) const; + + private: + BiDirIIOPServiceContext *ptr_; + }; + + class TAO_Export BiDirIIOPServiceContext_out + { + public: + BiDirIIOPServiceContext_out (BiDirIIOPServiceContext *&); + BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &); + BiDirIIOPServiceContext_out (const BiDirIIOPServiceContext_out &); + BiDirIIOPServiceContext_out &operator= (const BiDirIIOPServiceContext_out &); + BiDirIIOPServiceContext_out &operator= (BiDirIIOPServiceContext *); + operator BiDirIIOPServiceContext *&(); + BiDirIIOPServiceContext *&ptr (void); + BiDirIIOPServiceContext *operator-> (void); + + private: + BiDirIIOPServiceContext *&ptr_; + // assignment from T_var not allowed + void operator= (const BiDirIIOPServiceContext_var &); + }; + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext; + + +} +TAO_NAMESPACE_CLOSE // module IIOP + +TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&); +TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&); +TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version +TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&); + +#ifndef __ACE_INLINE__ + +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &); + +#if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_ +#define _TAO_CDR_OP_IIOP_ListenPointList_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const IIOP::ListenPointList & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + IIOP::ListenPointList & + ); + +#endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */ + +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServiceContext &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &); + +#endif /* __ACE_INLINE__ */ + + +#if defined (__ACE_INLINE__) +#include "IIOPC.i" +#endif /* defined INLINE */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include "ace/post.h" +#endif /* ifndef */ diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i new file mode 100644 index 00000000000..40161661eac --- /dev/null +++ b/TAO/tao/IIOPC.i @@ -0,0 +1,811 @@ +// -*- 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 + +// ************************************************************* +// Inline operations for class IIOP::ListenPoint_var +// ************************************************************* + +ACE_INLINE +IIOP::ListenPoint_var::ListenPoint_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IIOP::ListenPoint_var::ListenPoint_var (ListenPoint *p) + : ptr_ (p) +{} + +ACE_INLINE +IIOP::ListenPoint_var::ListenPoint_var (const ::IIOP::ListenPoint_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IIOP::ListenPoint (*p.ptr_)); + else + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPoint_var::~ListenPoint_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IIOP::ListenPoint_var & +IIOP::ListenPoint_var::operator= (ListenPoint *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE ::IIOP::ListenPoint_var & +IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &p) +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IIOP::ListenPoint (*p.ptr_), *this); + } + return *this; +} + +ACE_INLINE const ::IIOP::ListenPoint * +IIOP::ListenPoint_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPoint * +IIOP::ListenPoint_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IIOP::ListenPoint_var::operator const ::IIOP::ListenPoint &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::ListenPoint_var::operator ::IIOP::ListenPoint &() const // cast +{ + return *this->ptr_; +} + +// variable-size types only +ACE_INLINE +IIOP::ListenPoint_var::operator ::IIOP::ListenPoint *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IIOP::ListenPoint & +IIOP::ListenPoint_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPoint & +IIOP::ListenPoint_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IIOP::ListenPoint *& +IIOP::ListenPoint_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPoint * +IIOP::ListenPoint_var::_retn (void) +{ + ::IIOP::ListenPoint *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IIOP::ListenPoint * +IIOP::ListenPoint_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IIOP::ListenPoint_out +// ************************************************************* + +ACE_INLINE +IIOP::ListenPoint_out::ListenPoint_out (::IIOP::ListenPoint *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPoint_out::ListenPoint_out (ListenPoint_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPoint_out::ListenPoint_out (const ::IIOP::ListenPoint_out &p) // copy constructor + : ptr_ (ACE_const_cast (ListenPoint_out&, p).ptr_) +{} + +ACE_INLINE IIOP::ListenPoint_out & +IIOP::ListenPoint_out::operator= (const ::IIOP::ListenPoint_out &p) +{ + this->ptr_ = ACE_const_cast (ListenPoint_out&, p).ptr_; + return *this; +} + +ACE_INLINE IIOP::ListenPoint_out & +IIOP::ListenPoint_out::operator= (ListenPoint *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IIOP::ListenPoint_out::operator ::IIOP::ListenPoint *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPoint *& +IIOP::ListenPoint_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPoint * +IIOP::ListenPoint_out::operator-> (void) +{ + return this->ptr_; +} + + +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + +#if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_) +#define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CI_ + + // = Static operations. + ACE_INLINE IIOP::ListenPoint * + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (CORBA::ULong size) + // Allocate storage for the sequence. + { + IIOP::ListenPoint *retval = 0; + ACE_NEW_RETURN (retval, IIOP::ListenPoint[size], 0); + return retval; + } + + ACE_INLINE void IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (IIOP::ListenPoint *buffer) + // Free the sequence. + { + delete [] buffer; + } + + ACE_INLINE + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Default constructor. + { + } + + ACE_INLINE + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum) // Constructor using a maximum length value. + : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (maximum)) + { + } + + ACE_INLINE + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (CORBA::ULong maximum, + CORBA::ULong length, + IIOP::ListenPoint *data, + CORBA::Boolean release) + : TAO_Unbounded_Base_Sequence (maximum, length, data, release) + { + } + + ACE_INLINE + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_TAO_Unbounded_Sequence_IIOP_ListenPointList (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs) + // Copy constructor. + : TAO_Unbounded_Base_Sequence (rhs) + { + if (rhs.buffer_ != 0) + { + IIOP::ListenPoint *tmp1 = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->maximum_); + IIOP::ListenPoint * const tmp2 = ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + this->buffer_ = tmp1; + } + else + { + this->buffer_ = 0; + } + } + + ACE_INLINE IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList & + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator= (const _TAO_Unbounded_Sequence_IIOP_ListenPointList &rhs) + // Assignment operator. + { + if (this == &rhs) + return *this; + + if (this->release_) + { + if (this->maximum_ < rhs.maximum_) + { + // free the old buffer + IIOP::ListenPoint *tmp = ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_); + _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp); + this->buffer_ = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_); + } + } + else + this->buffer_ = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (rhs.maximum_); + + TAO_Unbounded_Base_Sequence::operator= (rhs); + + IIOP::ListenPoint *tmp1 = ACE_reinterpret_cast (IIOP::ListenPoint *, this->buffer_); + IIOP::ListenPoint * const tmp2 = ACE_reinterpret_cast (IIOP::ListenPoint * ACE_CAST_CONST, rhs.buffer_); + + for (CORBA::ULong i = 0; i < this->length_; ++i) + tmp1[i] = tmp2[i]; + + return *this; + } + + // = Accessors. + ACE_INLINE IIOP::ListenPoint & + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IIOP::ListenPoint* tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_); + return tmp[i]; + } + + ACE_INLINE const IIOP::ListenPoint & + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::operator[] (CORBA::ULong i) const + // operator [] + { + ACE_ASSERT (i < this->maximum_); + IIOP::ListenPoint * const tmp = ACE_reinterpret_cast (IIOP::ListenPoint* ACE_CAST_CONST, this->buffer_); + return tmp[i]; + } + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + + ACE_INLINE IIOP::ListenPoint * + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (CORBA::Boolean orphan) + { + IIOP::ListenPoint *result = 0; + if (orphan == 0) + { + // We retain ownership. + if (this->buffer_ == 0) + { + result = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (this->length_); + this->buffer_ = result; + this->release_ = 1; + } + else + { + result = ACE_reinterpret_cast (IIOP::ListenPoint*, this->buffer_); + } + } + else // if (orphan == 1) + { + if (this->release_ != 0) + { + // We set the state back to default and relinquish + // ownership. + result = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_); + this->maximum_ = 0; + this->length_ = 0; + this->buffer_ = 0; + this->release_ = 0; + } + } + return result; + } + + ACE_INLINE const IIOP::ListenPoint * + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::get_buffer (void) const + { + return ACE_reinterpret_cast(const IIOP::ListenPoint * ACE_CAST_CONST, this->buffer_); + } + + ACE_INLINE void + IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::replace (CORBA::ULong max, + CORBA::ULong length, + IIOP::ListenPoint *data, + CORBA::Boolean release) + { + this->maximum_ = max; + this->length_ = length; + if (this->buffer_ && this->release_ == 1) + { + IIOP::ListenPoint *tmp = ACE_reinterpret_cast(IIOP::ListenPoint*,this->buffer_); + _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp); + } + this->buffer_ = data; + this->release_ = release; + } + +#endif /* end #if !defined */ + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + +#if !defined (_IIOP_LISTENPOINTLIST_CI_) +#define _IIOP_LISTENPOINTLIST_CI_ + +// ************************************************************* +// Inline operations for class IIOP::ListenPointList_var +// ************************************************************* + +ACE_INLINE +IIOP::ListenPointList_var::ListenPointList_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IIOP::ListenPointList_var::ListenPointList_var (ListenPointList *p) + : ptr_ (p) +{} + +ACE_INLINE +IIOP::ListenPointList_var::ListenPointList_var (const ::IIOP::ListenPointList_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IIOP::ListenPointList (*p.ptr_)); + else + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPointList_var::~ListenPointList_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IIOP::ListenPointList_var & +IIOP::ListenPointList_var::operator= (ListenPointList *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE IIOP::ListenPointList_var & +IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // deep copy +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IIOP::ListenPointList (*p.ptr_), *this); + } + return *this; +} + +ACE_INLINE const ::IIOP::ListenPointList * +IIOP::ListenPointList_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPointList * +IIOP::ListenPointList_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IIOP::ListenPointList_var::operator const ::IIOP::ListenPointList &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::ListenPointList_var::operator ::IIOP::ListenPointList &() const // cast +{ + return *this->ptr_; +} + +// variable-size types only +ACE_INLINE +IIOP::ListenPointList_var::operator ::IIOP::ListenPointList *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE IIOP::ListenPoint & +IIOP::ListenPointList_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const IIOP::ListenPoint & +IIOP::ListenPointList_var::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const IIOP::ListenPoint &, this->ptr_->operator[] (index)); +} + +ACE_INLINE const ::IIOP::ListenPointList & +IIOP::ListenPointList_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPointList & +IIOP::ListenPointList_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IIOP::ListenPointList *& +IIOP::ListenPointList_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPointList * +IIOP::ListenPointList_var::_retn (void) +{ + ::IIOP::ListenPointList *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IIOP::ListenPointList * +IIOP::ListenPointList_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IIOP::ListenPointList_out +// ************************************************************* + +ACE_INLINE +IIOP::ListenPointList_out::ListenPointList_out (ListenPointList *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPointList_out::ListenPointList_out (ListenPointList_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::ListenPointList_out::ListenPointList_out (const ::IIOP::ListenPointList_out &p) // copy constructor + : ptr_ (ACE_const_cast (ListenPointList_out&, p).ptr_) +{} + +ACE_INLINE ::IIOP::ListenPointList_out & +IIOP::ListenPointList_out::operator= (const ::IIOP::ListenPointList_out &p) +{ + this->ptr_ = ACE_const_cast (ListenPointList_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::IIOP::ListenPointList_out & +IIOP::ListenPointList_out::operator= (ListenPointList *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IIOP::ListenPointList_out::operator ::IIOP::ListenPointList *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPointList *& +IIOP::ListenPointList_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::ListenPointList * +IIOP::ListenPointList_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE IIOP::ListenPoint & +IIOP::ListenPointList_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + +// ************************************************************* +// Inline operations for class IIOP::BiDirIIOPServiceContext_var +// ************************************************************* + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (BiDirIIOPServiceContext *p) + : ptr_ (p) +{} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::BiDirIIOPServiceContext_var (const ::IIOP::BiDirIIOPServiceContext_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_)); + else + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::~BiDirIIOPServiceContext_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE IIOP::BiDirIIOPServiceContext_var & +IIOP::BiDirIIOPServiceContext_var::operator= (BiDirIIOPServiceContext *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext_var & +IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &p) +{ + if (this != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_), *this); + } + return *this; +} + +ACE_INLINE const ::IIOP::BiDirIIOPServiceContext * +IIOP::BiDirIIOPServiceContext_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext * +IIOP::BiDirIIOPServiceContext_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::operator const ::IIOP::BiDirIIOPServiceContext &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext &() const // cast +{ + return *this->ptr_; +} + +// variable-size types only +ACE_INLINE +IIOP::BiDirIIOPServiceContext_var::operator ::IIOP::BiDirIIOPServiceContext *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE const ::IIOP::BiDirIIOPServiceContext & +IIOP::BiDirIIOPServiceContext_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext & +IIOP::BiDirIIOPServiceContext_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::IIOP::BiDirIIOPServiceContext *& +IIOP::BiDirIIOPServiceContext_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext * +IIOP::BiDirIIOPServiceContext_var::_retn (void) +{ + ::IIOP::BiDirIIOPServiceContext *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext * +IIOP::BiDirIIOPServiceContext_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class IIOP::BiDirIIOPServiceContext_out +// ************************************************************* + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (::IIOP::BiDirIIOPServiceContext *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (BiDirIIOPServiceContext_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_out::BiDirIIOPServiceContext_out (const ::IIOP::BiDirIIOPServiceContext_out &p) // copy constructor + : ptr_ (ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_) +{} + +ACE_INLINE IIOP::BiDirIIOPServiceContext_out & +IIOP::BiDirIIOPServiceContext_out::operator= (const ::IIOP::BiDirIIOPServiceContext_out &p) +{ + this->ptr_ = ACE_const_cast (BiDirIIOPServiceContext_out&, p).ptr_; + return *this; +} + +ACE_INLINE IIOP::BiDirIIOPServiceContext_out & +IIOP::BiDirIIOPServiceContext_out::operator= (BiDirIIOPServiceContext *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +IIOP::BiDirIIOPServiceContext_out::operator ::IIOP::BiDirIIOPServiceContext *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext *& +IIOP::BiDirIIOPServiceContext_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::IIOP::BiDirIIOPServiceContext * +IIOP::BiDirIIOPServiceContext_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::ListenPoint &_tao_aggregate) +{ + if ( + (strm << _tao_aggregate.host.in ()) && + (strm << _tao_aggregate.port) + ) + return 1; + else + return 0; + +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::ListenPoint &_tao_aggregate) +{ + if ( + (strm >> _tao_aggregate.host.out ()) && + (strm >> _tao_aggregate.port) + ) + return 1; + else + return 0; + +} + + +#if !defined _TAO_CDR_OP_IIOP_ListenPointList_I_ +#define _TAO_CDR_OP_IIOP_ListenPointList_I_ + +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const IIOP::ListenPointList & + ); +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + IIOP::ListenPointList & + ); + +#endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */ + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IIOP::BiDirIIOPServiceContext &_tao_aggregate) +{ + if ( + (strm << _tao_aggregate.listen_points) + ) + return 1; + else + return 0; + +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IIOP::BiDirIIOPServiceContext &_tao_aggregate) +{ + if ( + (strm >> _tao_aggregate.listen_points) + ) + return 1; + else + return 0; + +} + diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index bae66889a57..9aabdd177a8 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -1,6 +1,5 @@ // This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file IIOP_Acceptor.h @@ -55,6 +54,9 @@ public: /// away const ACE_INET_Addr& address (void) const; + /// Returns the array of endpoints in this acceptor + const ACE_INET_Addr *endpoints (void); + typedef ACE_Strategy_Acceptor<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_BASE_ACCEPTOR; typedef TAO_Creation_Strategy<TAO_IIOP_Connection_Handler> TAO_IIOP_CREATION_STRATEGY; typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> TAO_IIOP_CONCURRENCY_STRATEGY; diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i index f7c171d6e5e..3b55c132b62 100644 --- a/TAO/tao/IIOP_Acceptor.i +++ b/TAO/tao/IIOP_Acceptor.i @@ -13,3 +13,11 @@ TAO_IIOP_Acceptor::address (void) const // -Ossama return this->addrs_[0]; } + +ACE_INLINE const ACE_INET_Addr * +TAO_IIOP_Acceptor::endpoints (void) +{ + ACE_ASSERT (this->addrs_ != 0); + + return this->addrs_; +} diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index b265fd3ca07..5c4d950c15f 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -259,6 +259,44 @@ TAO_IIOP_Connection_Handler::add_handler_to_cache (void) int +TAO_IIOP_Connection_Handler::process_listen_point_list ( + IIOP::ListenPointList &listen_list) +{ + // Get the size of the list + CORBA::ULong len = listen_list.length (); + + for (CORBA::ULong i = 0; i < len; ++ i) + { + IIOP::ListenPoint listen_point = listen_list[i]; + ACE_INET_Addr addr (listen_point.port, + listen_point.host.in ()); + + + // Construct an IIOP_Endpoint object + TAO_IIOP_Endpoint endpoint (addr, + 0); + + // Construct a property object + TAO_Base_Connection_Property prop (&endpoint); + + // Mark the connection as bidirectional + prop.set_bidir_flag (1); + + // The property for this handler has changed. Recache the + // handler with this property + int retval = this->recache_handler (&prop); + if (retval == -1) + return retval; + + // Make the handler idle and ready for use + this->make_idle (); + } + + return 0; +} + + +int TAO_IIOP_Connection_Handler::handle_input (ACE_HANDLE h) { return this->handle_input_i (h); diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index aee04e27cc0..57dd92fade4 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -26,6 +26,7 @@ #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" #include "tao/IIOP_Transport.h" +#include "tao/IIOPC.h" // Forward Decls class TAO_Pluggable_Messaging; @@ -50,6 +51,7 @@ public: }; + // **************************************************************** /** @@ -121,6 +123,8 @@ public: /// Add ourselves to Cache. int add_handler_to_cache (void); + /// Process the <listen_list> + int process_listen_point_list (IIOP::ListenPointList &listen_list); protected: /// = Event Handler overloads diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 211cf10721c..5d0e7c3c1ad 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -4,7 +4,10 @@ #include "tao/IIOP_Transport.h" #include "tao/IIOP_Connection_Handler.h" +#include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Profile.h" +#include "tao/Acceptor_Registry.h" +#include "tao/operation_details.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" @@ -17,6 +20,7 @@ #include "tao/GIOP_Message_Lite.h" + #if !defined (__ACE_INLINE__) # include "tao/IIOP_Transport.i" #endif /* ! __ACE_INLINE__ */ @@ -30,7 +34,8 @@ TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, : TAO_Transport (TAO_TAG_IIOP_PROFILE, orb_core), connection_handler_ (handler), - messaging_object_ (0) + messaging_object_ (0), + bidirectional_flag_ (0) { if (flag) { @@ -299,6 +304,20 @@ TAO_IIOP_Transport::send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, TAO_OutputCDR &msg) { + // Check whether we have a Bi Dir IIOP policy set, whether the + // messaging objects are ready to handle bidirectional connections + // and also make sure that we have not recd. or sent any information + // regarding this before... + if (this->orb_core ()->bidir_giop_policy () && + this->messaging_object_->is_ready_for_bidirectional () && + this->bidirectional_flag_ == 0) + { + this->set_bidir_context_info (opdetails); + + // Set the flag to 1 + this->bidirectional_flag_ = 1; + } + // We are going to pass on this request to the underlying messaging // layer. It should take care of this request if (this->messaging_object_->generate_request_header (opdetails, @@ -318,6 +337,34 @@ TAO_IIOP_Transport::messaging_init (CORBA::Octet major, return 1; } +void +TAO_IIOP_Transport::bidirectional_flag (int flag) +{ + this->bidirectional_flag_ = flag; +} + + + +int +TAO_IIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr) +{ + CORBA::Boolean byte_order; + if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) + return -1; + + cdr.reset_byte_order (ACE_static_cast(int,byte_order)); + + IIOP::ListenPointList listen_list; + if ((cdr >> listen_list) == 0) + return -1; + + // As we have received a bidirectional information, set the flag to + // 1 + this->bidirectional_flag_ = 1; + return this->connection_handler_->process_listen_point_list (listen_list); +} + + int TAO_IIOP_Transport::process_message (void) { @@ -422,3 +469,125 @@ TAO_IIOP_Transport::process_message (void) this->messaging_object_->reset (); return 1; } + + +void +TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) +{ + + // Get a handle on to the acceptor registry + TAO_Acceptor_Registry * ar = + this->orb_core ()->acceptor_registry (); + + + // Get the first acceptor in the registry + TAO_AcceptorSetIterator acceptor = ar->begin (); + + IIOP::ListenPointList listen_point_list; + + for (; + acceptor != ar->end (); + acceptor++) + { + // Check whether it is a IIOP acceptor + if ((*acceptor)->tag () == TAO_TAG_IIOP_PROFILE) + { + this->get_listen_point (listen_point_list, + *acceptor); + } + } + + // We have the ListenPointList at this point. Create a output CDR + // stream at this point + TAO_OutputCDR cdr; + + // Marshall the information into the stream + if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)== 0) + || (cdr << listen_point_list) == 0) + return; + + // Add this info in to the svc_list + opdetails.service_context ().set_context (IOP::BI_DIR_IIOP, + cdr); + + return; +} + + +int +TAO_IIOP_Transport::get_listen_point ( + IIOP::ListenPointList &listen_point_list, + TAO_Acceptor *acceptor) +{ + TAO_IIOP_Acceptor *iiop_acceptor = + ACE_dynamic_cast (TAO_IIOP_Acceptor *, + acceptor ); + + // Get the array of endpoints serviced by <iiop_acceptor> + const ACE_INET_Addr *endpoint_addr = + iiop_acceptor->endpoints (); + + // Get the count + size_t count = + iiop_acceptor->endpoint_count (); + + // Get the local address of the connection + ACE_INET_Addr local_addr; + + if (this->connection_handler_->peer ().get_local_addr (local_addr) + == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Could not resolve local host") + ACE_TEXT (" address in set_bidir_context_info () \n")), + -1); + } + + + + for (size_t index = 0; + index <= count; + index++) + { + // Get the listen point on that acceptor if it has the same + // interface on which this connection is established + + // Note: Looks like there is no point in sending the list of + // endpoints on interfaces on which this connection has not + // been established. If this is wrong, please correct me. + char local_interface[MAXHOSTNAMELEN]; + char acceptor_interface[MAXHOSTNAMELEN]; + + if (endpoint_addr[index].get_host_name (acceptor_interface, + MAXHOSTNAMELEN) == + -1) + continue; + + if (local_addr.get_host_name (local_interface, + MAXHOSTNAMELEN) == -1) + continue; + + // @@ This is very bad for performance, but it is a one time + // affair + if (ACE_OS::strcmp (local_interface, + acceptor_interface) == 0) + { + // We have the connection and the acceptor endpoint on the + // same interface + IIOP::ListenPoint point; + point.host = CORBA::string_dup (local_interface); + point.port = endpoint_addr[index].get_port_number (); + + // Get the count of the number of elements + CORBA::ULong len = listen_point_list.length (); + + // Increase the length by 1 + listen_point_list.length (len + 1); + + // Add the new length to the list + listen_point_list[len] = point; + } + } + + return 1; +} diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index d32f6426c90..51ed65c08ec 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -25,6 +25,7 @@ #include "ace/SOCK_Stream.h" #include "ace/Synch.h" #include "ace/Svc_Handler.h" +#include "tao/IIOPC.h" // Forward decls. @@ -33,6 +34,7 @@ class TAO_ORB_Core; class TAO_Operation_Details; class TAO_Pluggable_Messaging; + // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_IIOP_SVC_HANDLER; @@ -138,11 +140,24 @@ public: virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor); + /// Set the bidirectional flag + virtual void bidirectional_flag (int flag); + + /// Open teh service context list and process it. + virtual int tear_listen_point_list (TAO_InputCDR &cdr); private: /// Process the message that we have read int process_message (void); + /// Set the Bidirectional context info in the service context list + void set_bidir_context_info (TAO_Operation_Details &opdetails); + + /// Add the listen points in <acceptor> to the <listen_point_list> + /// if this connection is in the same interface as that of the + /// endpoints in the <acceptor> + int get_listen_point (IIOP::ListenPointList &listen_point_list, + TAO_Acceptor *acceptor); private: /// The connection service handler used for accessing lower layer @@ -151,6 +166,19 @@ private: /// Our messaging object. TAO_Pluggable_Messaging *messaging_object_; + + /// Have we sent any info on bidirectional information or have we + /// received any info regarding making the connection + /// served by this transport bidirectional. This is essentially for + /// this -- we dont want to send the bidirectional context info more + /// than once on the connection. Why? Waste of marshalling and + /// demarshalling time on the client. On the server side, we need + /// this flag for this -- once a client that has established the + /// connection asks the server to use the connection bith ways, we + /// *dont* want the server to go pack service info to the + /// client. That would be *bad*.. + int bidirectional_flag_; + }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index a611742130f..697b2020bcc 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -56,8 +56,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -175,8 +176,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Object.h \ @@ -214,8 +214,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/IORManip_Loader.o .obj/IORManip_Loader.so .shobj/IORManip_Loader.o .shobj/IORManip_Loader.so: IORManip_Loader.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -333,8 +334,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Object.h \ @@ -364,6 +364,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -486,8 +488,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Environment.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 27eb1060a2e..7f646f3c739 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -54,8 +54,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORTable.o .obj/IORTable.so .shobj/IORTable.o .shobj/IORTable.so: IORTable.cpp IORTable.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -150,8 +151,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -205,6 +205,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -371,11 +373,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - IORTableC.i Table_Adapter.h + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i IORTableC.i \ + Table_Adapter.h .obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -523,6 +529,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -689,11 +697,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -864,6 +875,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1009,11 +1022,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - IORTableC.i + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i IORTableC.i .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ $(ACE_ROOT)/ace/pre.h IORTable.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1108,8 +1123,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1163,6 +1177,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1329,6 +1345,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - IORTableC.i + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i IORTableC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 0abfc1ff94e..7facdf85453 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -589,6 +589,15 @@ TAO_GIOP_Invocation::add_rt_service_context (CORBA_Environment &ACE_TRY_ENV) == 0) ACE_THROW (CORBA::MARSHAL ()); + // @@ The piece of code that comes here should go. It should + // be something like this. + // IOP::ServiceContext context; + // context.context_id = IOP::RTCorbaPriority; + // this->op_details_.service_context ().set_context + // (context, cdr); + // RT Folks can you please do these changes consistently + // wherever you guys are adding service context information + // - Bala IOP::ServiceContextList &context_list = this->service_info (); CORBA::ULong l = context_list.length (); diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index e927ab820cd..0d14974c6e7 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -90,7 +90,8 @@ PLUGGABLE_PROTOCOLS_FILES = \ IIOP_Connector \ IIOP_Acceptor \ IIOP_Connection_Handler \ - IIOP_Endpoint + IIOP_Endpoint \ + IIOPC PLUGGABLE_MESSAGING_FILES = \ Pluggable_Messaging \ @@ -196,6 +197,7 @@ ORB_CORE_FILES = \ CONV_FRAMEC \ CONV_FRAMES \ Tagged_Components \ + Service_Context \ GIOPC \ GIOPS \ BoundsC \ @@ -225,7 +227,11 @@ ORB_CORE_FILES = \ Cleanup_Func_Registry \ Connection_Descriptor_Interface \ IORInfo \ - Object_Ref_Table + Object_Ref_Table \ + BiDirPolicyC \ + BiDir_ORBInitializer \ + BiDir_PolicyFactory \ + BiDir_Policy_i DYNAMIC_ANY_FILES = @@ -464,6 +470,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -733,6 +741,8 @@ realclean: .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -826,8 +836,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Tagged_Components.h \ - IOPC.h \ + Tagged_Components.h IOPC.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -844,8 +853,7 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - PolicyC.h \ - CurrentC.h \ + PolicyC.h CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -865,8 +873,8 @@ realclean: GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i Object_KeyC.h \ - Object_KeyC.i \ - MessagingC.h Remote_Object_Proxy_Impl.h \ + Object_KeyC.i MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -877,9 +885,8 @@ realclean: TimeBaseC.i \ PolicyC.h \ PollableC.h \ - PollableC.i \ - MessagingC.i Stub.h \ - Pluggable.h \ + PollableC.i MessagingC.i \ + Stub.h Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -1001,6 +1008,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1102,6 +1111,8 @@ realclean: Pluggable.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1366,6 +1377,8 @@ realclean: $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1634,6 +1647,8 @@ realclean: Pluggable.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1923,6 +1938,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2030,6 +2047,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2129,6 +2148,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2247,8 +2268,7 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - iiop_endpoints.i + Any.i iiop_endpoints.i .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \ IIOP_Factory.h \ @@ -2256,6 +2276,8 @@ realclean: Protocol_Factory.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2472,6 +2494,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ Acceptor_Impl.h \ @@ -2570,6 +2594,8 @@ realclean: Protocol_Factory.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2786,6 +2812,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ Acceptor_Impl.h \ @@ -2890,6 +2918,8 @@ realclean: Profile.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3164,6 +3194,8 @@ realclean: Pluggable.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3363,6 +3395,8 @@ realclean: $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ @@ -3379,12 +3413,16 @@ realclean: Connection_Cache_Manager.inl \ Connection_Handler.inl \ IIOP_Connection_Handler.i \ - IIOP_Profile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ + IIOP_Acceptor.h \ + Acceptor_Impl.h \ + Acceptor_Impl.i \ + Acceptor_Impl.cpp \ + ORB_Core.h \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ PolicyC.h \ CurrentC.h \ Object.h \ @@ -3397,44 +3435,10 @@ realclean: Environment.h \ Environment.i \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - Object_KeyC.h \ - Object_KeyC.i \ - IIOP_Endpoint.h \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ ORB.i \ - IIOP_Endpoint.i \ - IIOP_Profile.i \ - Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ - Transport_Mux_Strategy.h \ - Sync_Strategies.h \ - TAOC.h \ - TimeBaseC.h \ - Any.h \ - Any.i \ - TimeBaseC.i \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ + Policy_Manager.h \ LocalObject.h \ LocalObject.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - Sync_Strategies.i \ - Stub.h \ - MProfile.h \ - MProfile.i \ - ORB_Core.h \ - Policy_Manager.h \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -3450,6 +3454,8 @@ realclean: PolicyFactory_Registry.h \ PortableInterceptorC.h \ DynamicC.h \ + Any.h \ + Any.i \ DynamicC.i \ MessagingC.h \ Remote_Object_Proxy_Impl.h \ @@ -3457,6 +3463,8 @@ realclean: ValueBase.i \ ValueFactory.h \ ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -3476,8 +3484,55 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i \ + ORB_Table.h \ + ORB_Table.inl \ + Server_Strategy_Factory.h \ + Connector_Registry.h \ + Connector_Registry.i \ debug.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + IIOP_Acceptor.i \ + IIOP_Profile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + Profile.i \ + Object_KeyC.h \ + Object_KeyC.i \ + IIOP_Endpoint.h \ + IIOP_Endpoint.i \ + IIOP_Profile.i \ + Acceptor_Registry.h \ + Acceptor_Registry.i \ + operation_details.h \ + Service_Context.h \ + Service_Context.inl \ + target_specification.h \ + target_specification.i \ + operation_details.i \ + Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h \ + Transport_Mux_Strategy.h \ + Sync_Strategies.h \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + Sync_Strategies.i \ + Stub.h \ + MProfile.h \ + MProfile.i \ + Stub.i \ GIOP_Message_Base.h \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ @@ -3508,6 +3563,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3730,6 +3787,8 @@ realclean: Connection_Cache_Manager.inl \ Connection_Handler.inl \ IIOP_Transport.h \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ IIOP_Profile.h \ @@ -3843,6 +3902,8 @@ realclean: Pluggable.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4057,6 +4118,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ Acceptor_Impl.h \ @@ -4185,6 +4248,8 @@ realclean: $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4397,6 +4462,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ Timeprobe.h \ @@ -4483,6 +4550,8 @@ realclean: Endpoint.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4716,10 +4785,139 @@ realclean: $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + IIOPC.h \ + IIOPC.i \ IIOP_Transport.i \ IIOP_Connection_Handler.i \ debug.h +.obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp IIOPC.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + Managed_Types.h \ + Managed_Types.i \ + Sequence_T.h \ + Sequence.h \ + Sequence.i \ + Sequence_T.i \ + Sequence_T.cpp \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + IIOPC.i \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + Any.h \ + Environment.h \ + Environment.i \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + Any.i + .obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \ default_client.h \ $(ACE_ROOT)/ace/pre.h \ @@ -4728,6 +4926,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4989,6 +5189,8 @@ realclean: Server_Strategy_Factory.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5247,6 +5449,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5540,6 +5744,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5723,6 +5929,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5902,6 +6110,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6044,6 +6254,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6180,11 +6392,12 @@ realclean: ORB.i \ Marshal.i -.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \ - Marshal.h \ +.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6327,6 +6540,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6455,12 +6670,13 @@ realclean: PolicyC.i \ ORB.i -.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \ - Any.h \ +.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any.h \ $(ACE_ROOT)/ace/pre.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6720,6 +6936,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6821,6 +7039,8 @@ realclean: Object.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6930,6 +7150,8 @@ realclean: .obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7067,6 +7289,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7176,6 +7400,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7429,6 +7655,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7701,6 +7929,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -7724,6 +7954,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -7993,6 +8225,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -8125,10 +8359,11 @@ realclean: Any.h \ Any.i -.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -8329,8 +8564,7 @@ realclean: params.h \ params.i \ Connector_Registry.i \ - IOR_Parser.h \ - IOR_Parser.i \ + IOR_Parser.h IOR_Parser.i \ Parser_Registry.h \ Parser_Registry.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ @@ -8360,8 +8594,8 @@ realclean: $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Arg_Shifter.h \ - Object.h Typecode.h Stub.h \ + $(ACE_ROOT)/ace/Arg_Shifter.h Object.h \ + Typecode.h Stub.h \ MProfile.h \ Profile.h \ Tagged_Components.h \ @@ -8448,20 +8682,22 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - RT_Current.h \ - RT_Current.i \ + RT_Current.h RT_Current.i \ ORBInitInfo.h corbafwd.h PortableInterceptorC.h LocalObject.h \ StringSeqC.h StringSeqC.i ORBInitializer_Registry.h TAO_Singleton.h \ ORBInitializer_Registry.inl \ - RT_ORBInitializer.h Messaging_ORBInitializer.h ValueFactory_Map.h \ + RT_ORBInitializer.h Messaging_ORBInitializer.h \ + BiDir_ORBInitializer.h \ + ValueFactory_Map.h \ ValueFactory_Map.i \ - Object_KeyC.h \ - Object_KeyC.i + Object_KeyC.h Object_KeyC.i .obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \ corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -8563,6 +8799,8 @@ realclean: Object.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -8833,6 +9071,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -8847,6 +9087,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -8946,6 +9188,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9045,6 +9289,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9145,6 +9391,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9247,6 +9495,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9346,6 +9596,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9618,6 +9870,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -9630,6 +9884,8 @@ realclean: .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9722,8 +9978,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PolicyC.h \ + corbafwd.i PolicyC.h \ CurrentC.h \ Object.h \ corbafwd.h \ @@ -9767,10 +10022,44 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i ClientRequestInfo.inl DomainC.i Stub.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i StringSeqC.h \ + StringSeqC.i Invocation.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ + LocalObject.h \ + Priority_Mapping_Manager.i \ + TAOC.i \ + operation_details.h \ + Service_Context.h \ + Service_Context.inl \ + target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ + target_specification.i \ + operation_details.i \ + Invocation_Endpoint_Selectors.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + Profile.i \ + MProfile.i \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ + ClientRequestInfo.inl DomainC.i Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -9832,16 +10121,6 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - MProfile.i \ ORB.h \ Services.h \ Services.i \ @@ -9850,7 +10129,6 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ - LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -9888,30 +10166,8 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - target_specification.h \ - Object_KeyC.h \ - Object_KeyC.i \ - target_specification.i \ - operation_details.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - Invocation.i \ - Exception.h InterfaceC.h \ - ifrfwd.h \ + Stub.i Exception.h \ + InterfaceC.h ifrfwd.h \ Remote_Object_Proxy_Impl.h \ ORB_Core.h PortableInterceptor.h \ PortableInterceptor.i @@ -9923,6 +10179,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10048,6 +10306,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10169,6 +10429,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10282,6 +10544,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10388,6 +10652,8 @@ realclean: $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10586,6 +10852,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10844,8 +11112,8 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i Sequence.h \ - Object.h Invocation.h \ + Stub.i Sequence.h Object.h \ + Invocation.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ @@ -10858,6 +11126,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -10906,6 +11176,8 @@ realclean: $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11047,6 +11319,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11300,6 +11574,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11400,6 +11676,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11570,9 +11848,10 @@ realclean: PolicyC.i \ ORB.i -.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \ - Timeprobe.h \ +.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11832,6 +12111,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11871,11 +12152,12 @@ realclean: $(ACE_ROOT)/ace/Service_Object.i \ TAO_Export.h -.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \ - debug.h \ +.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -11975,6 +12257,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -12089,6 +12373,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -12232,6 +12518,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -12419,6 +12707,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -12573,6 +12863,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -12726,6 +13018,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -12869,6 +13163,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -13017,6 +13313,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13110,6 +13408,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + Service_Context.h \ IOPC.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -13123,6 +13422,7 @@ realclean: Sequence_T.i \ Sequence_T.cpp \ IOPC.i \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -13133,6 +13433,8 @@ realclean: corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13282,6 +13584,8 @@ realclean: .obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13376,8 +13680,8 @@ realclean: TAO_Export.h \ corbafwd.i \ PortableInterceptorC.h \ - corbafwd.h \ - DynamicC.h Any.h \ + corbafwd.h DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -13402,8 +13706,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -13418,16 +13722,158 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i ClientRequestInfo.inl + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i StringSeqC.h \ + StringSeqC.i Invocation.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ + LocalObject.h \ + Priority_Mapping_Manager.i \ + TAOC.i \ + operation_details.h \ + Service_Context.h \ + Service_Context.inl \ + target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ + target_specification.i \ + operation_details.i \ + Invocation_Endpoint_Selectors.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + Profile.i \ + MProfile.i \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ + ClientRequestInfo.inl Stub.h \ + Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + Pluggable.i \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ + ORB_Core.h \ + Policy_Manager.h \ + Policy_Manager.i \ + Resource_Factory.h \ + Protocol_Factory.h \ + params.h \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Connection_Cache_Manager.h \ + Cache_Entries.h \ + Connection_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Connection_Descriptor_Interface.inl \ + Cache_Entries.inl \ + Connection_Cache_Manager.inl \ + Cleanup_Func_Registry.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i \ + Stub.i Tagged_Components.h .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \ - PortableInterceptorC.h \ - $(ACE_ROOT)/ace/pre.h \ + PortableInterceptorC.h $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13520,8 +13966,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - DynamicC.h Any.h \ + corbafwd.i DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -13546,8 +13992,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -13562,8 +14008,8 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i \ CORBA_String.h \ CORBA_String.inl @@ -13571,6 +14017,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13689,8 +14137,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i \ + Sequence_T.cpp DynamicC.i \ StringSeqC.h \ StringSeqC.i @@ -13698,6 +14145,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13797,8 +14246,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - OctetSeqC.i Any.h \ + Sequence_T.cpp OctetSeqC.i \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -13822,6 +14271,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -13921,8 +14372,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - StringSeqC.i \ + Sequence_T.cpp StringSeqC.i \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -13946,6 +14396,8 @@ realclean: .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -14073,8 +14525,8 @@ realclean: Environment.h \ Environment.i \ PolicyC.i \ - ORB.i \ - Environment.h Policy_Manager.h \ + ORB.i Environment.h \ + Policy_Manager.h \ LocalObject.h \ LocalObject.i \ Policy_Manager.i \ @@ -14142,8 +14594,8 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - Protocol_Factory.h \ - params.h params.i \ + Protocol_Factory.h params.h \ + params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -14162,8 +14614,8 @@ realclean: TimeBaseC.h \ TimeBaseC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -14192,9 +14644,8 @@ realclean: default_server.i \ default_resource.h \ Resource_Factory.h \ - default_resource.i \ - debug.h MProfile.h \ - Profile.h \ + default_resource.i debug.h \ + MProfile.h Profile.h \ Tagged_Components.h \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ @@ -14206,8 +14657,7 @@ realclean: MProfile.h \ ORB.h \ ORB_Core.h \ - Stub.i \ - Reactor_Registry.h \ + Stub.i Reactor_Registry.h \ Reactor_Registry.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -14216,8 +14666,7 @@ realclean: Connector_Registry.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ - RT_ORB.h \ - RTCORBAS.h \ + RT_ORB.h RTCORBAS.h \ IOPS.h \ IOPS_T.h \ IOPS_T.i \ @@ -14239,12 +14688,9 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - RT_Current.h \ - RT_Current.i \ - RT_Policy_i.h \ - RT_Policy_i.i \ - Sync_Strategies.h \ - TAOC.h \ + RT_Current.h RT_Current.i \ + RT_Policy_i.h RT_Policy_i.i \ + Sync_Strategies.h TAOC.h \ Priority_Mapping_Manager.h \ TAOC.i \ Sync_Strategies.i \ @@ -14263,6 +14709,8 @@ realclean: Reply_Dispatcher.h \ Reply_Dispatcher.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -14276,6 +14724,8 @@ realclean: .obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \ $(ACE_ROOT)/ace/pre.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -14396,9 +14846,8 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - ORB_Table.inl \ - ORB_Core.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + ORB_Table.inl ORB_Core.h \ + corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -14442,8 +14891,8 @@ realclean: Environment.h \ Environment.i \ PolicyC.i \ - ORB.i \ - Environment.h Policy_Manager.h \ + ORB.i Environment.h \ + Policy_Manager.h \ LocalObject.h \ LocalObject.i \ Policy_Manager.i \ @@ -14479,8 +14928,8 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - Protocol_Factory.h \ - params.h params.i \ + Protocol_Factory.h params.h \ + params.i \ TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \ Any.h \ @@ -14493,8 +14942,8 @@ realclean: TimeBaseC.h \ TimeBaseC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -14521,6 +14970,8 @@ realclean: ORB_Core.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -14775,6 +15226,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -14875,6 +15328,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -14978,6 +15433,8 @@ realclean: $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -15240,6 +15697,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -15343,6 +15802,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -15622,6 +16083,8 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -15730,8 +16193,8 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/ARGV.i \ - $(ACE_ROOT)/ace/Arg_Shifter.h \ - TAO_Internal.h TAO_Export.h default_server.h \ + $(ACE_ROOT)/ace/Arg_Shifter.h TAO_Internal.h \ + TAO_Export.h default_server.h \ Server_Strategy_Factory.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -15845,6 +16308,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -15983,6 +16448,8 @@ realclean: Tagged_Profile.i \ OctetSeqC.h \ OctetSeqC.i \ + Service_Context.h \ + Service_Context.inl \ TAO_Server_Request.i \ Principal.h \ Principal.i \ @@ -16120,6 +16587,8 @@ realclean: $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -16273,6 +16742,37 @@ realclean: LocalObject.i \ StringSeqC.h \ StringSeqC.i \ + Invocation.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + operation_details.h \ + Service_Context.h \ + Service_Context.inl \ + target_specification.h \ + target_specification.i \ + operation_details.i \ + Invocation_Endpoint_Selectors.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + Profile.i \ + MProfile.i \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ ClientRequestInfo.inl \ DomainC.i \ WrongTransactionC.h \ @@ -16287,6 +16787,8 @@ realclean: Reactor_Registry.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -16545,6 +17047,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -16645,6 +17149,8 @@ realclean: Wait_Strategy.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -16825,6 +17331,8 @@ realclean: Wait_Strategy.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17080,6 +17588,8 @@ realclean: Wait_Strategy.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17337,6 +17847,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17452,6 +17964,8 @@ realclean: Transport_Mux_Strategy.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17637,6 +18151,8 @@ realclean: Transport_Mux_Strategy.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17823,6 +18339,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -17937,6 +18455,8 @@ realclean: Reply_Dispatcher.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -18197,6 +18717,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -18454,9 +18976,10 @@ realclean: Leader_Follower.i \ debug.h -.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -18561,8 +19084,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i Any.h \ + Sequence_T.cpp IOPC.i \ + Any.h \ Environment.h \ Environment.i \ Object.h \ @@ -18578,9 +19101,10 @@ realclean: Typecode.i \ Any.i -.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h \ - $(ACE_ROOT)/ace/pre.h IOPC.h \ - TAO_Export.h \ +.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h $(ACE_ROOT)/ace/pre.h \ + IOPC.h TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -18685,13 +19209,15 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i + Sequence_T.cpp IOPC.i \ + IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i .obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -18964,6 +19490,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -18977,6 +19505,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19091,6 +19621,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19218,6 +19750,8 @@ realclean: CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19332,6 +19866,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19588,11 +20124,127 @@ realclean: Interceptor_List.inl \ ORB_Core.i -.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \ - GIOPC.h \ +.obj/Service_Context.o .obj/Service_Context.so .shobj/Service_Context.o .shobj/Service_Context.so: Service_Context.cpp \ + Service_Context.h \ $(ACE_ROOT)/ace/pre.h \ + IOPC.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + IOPC.i \ + Service_Context.inl + +.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19722,6 +20374,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19829,17 +20483,18 @@ realclean: Sequence_T.cpp \ IOPC.i \ Object_KeyC.h \ - Object_KeyC.i \ - GIOPC.i GIOPS_T.h \ + Object_KeyC.i GIOPC.i \ + GIOPS_T.h \ GIOPS_T.i \ - GIOPS_T.cpp \ - GIOPS.i + GIOPS_T.cpp GIOPS.i .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \ BoundsC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19954,10 +20609,11 @@ realclean: Any.i \ BoundsC.i -.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20104,6 +20760,8 @@ realclean: corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20196,13 +20854,15 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - TAOS_T.h TAOS_T.i TAOS_T.cpp TAOS.i + corbafwd.i TAOS_T.h \ + TAOS_T.i TAOS_T.cpp TAOS.i .obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20310,6 +20970,8 @@ realclean: $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20417,11 +21079,12 @@ realclean: Typecode.h \ Typecode.i -.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp \ - $(ACE_ROOT)/ace/ARGV.h \ +.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20634,6 +21297,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20893,6 +21558,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21000,6 +21667,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21131,6 +21800,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21392,6 +22063,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21504,6 +22177,8 @@ realclean: IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21620,8 +22295,8 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DLL_Parser.i Object_Loader.h Object_Loader.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DLL_Parser.i \ + Object_Loader.h Object_Loader.i \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -21639,6 +22314,8 @@ realclean: IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -21755,8 +22432,7 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - FILE_Parser.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h FILE_Parser.i \ Object_Loader.h \ Object_Loader.i \ Object.h \ @@ -21798,6 +22474,8 @@ realclean: IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22006,8 +22684,8 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - Protocol_Factory.h \ - params.h params.i \ + Protocol_Factory.h params.h \ + params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -22026,8 +22704,8 @@ realclean: TimeBaseC.h \ TimeBaseC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -22048,8 +22726,7 @@ realclean: Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \ Interceptor_List.h Interceptor_List.inl ORB_Core.i Stub.h \ ORB_Core.h \ - Stub.i \ - Connector_Registry.h \ + Stub.i Connector_Registry.h \ params.h \ Connector_Registry.i @@ -22058,6 +22735,8 @@ realclean: IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22223,6 +22902,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -22238,8 +22919,7 @@ realclean: Profile.i \ MProfile.i \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - Stub.h \ + Invocation.i Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -22346,6 +23026,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22463,6 +23145,8 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22721,6 +23405,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22869,6 +23555,8 @@ realclean: .obj/ORBInitInfo.o .obj/ORBInitInfo.so .shobj/ORBInitInfo.o .shobj/ORBInitInfo.so: ORBInitInfo.cpp ORBInitInfo.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -22963,8 +23651,8 @@ realclean: TAO_Export.h \ corbafwd.i \ PortableInterceptorC.h \ - corbafwd.h \ - DynamicC.h Any.h \ + corbafwd.h DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -22989,8 +23677,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -23005,16 +23693,16 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i ORB_Core.h ORB.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i StringSeqC.h \ + StringSeqC.i ORB_Core.h ORB.h \ Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ - ORB.i \ - Environment.h Policy_Manager.h \ + ORB.i Environment.h \ + Policy_Manager.h \ LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ @@ -23079,8 +23767,8 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - Protocol_Factory.h \ - params.h params.i \ + Protocol_Factory.h params.h \ + params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -23110,8 +23798,9 @@ realclean: Interceptor_List.h Interceptor_List.inl ORB_Core.i .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \ - ORBInitializer_Registry.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + ORBInitializer_Registry.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23207,8 +23896,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - DynamicC.h Any.h \ + corbafwd.i DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -23233,8 +23922,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -23249,8 +23938,8 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i TAO_Singleton.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ TAO_Singleton.h \ @@ -23270,9 +23959,10 @@ realclean: TAO_Singleton_Manager.h .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \ - PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + PolicyFactory_Registry.h $(ACE_ROOT)/ace/pre.h \ + corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23367,8 +24057,8 @@ realclean: TAO_Export.h \ corbafwd.i \ PortableInterceptorC.h \ - corbafwd.h \ - DynamicC.h Any.h \ + corbafwd.h DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -23393,8 +24083,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -23409,8 +24099,8 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -23441,6 +24131,8 @@ realclean: Endpoint.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23545,6 +24237,8 @@ realclean: Endpoint.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23647,6 +24341,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23908,9 +24604,10 @@ realclean: ORB_Core.i .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \ - Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + Cleanup_Func_Registry.h $(ACE_ROOT)/ace/pre.h \ + corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24012,6 +24709,8 @@ realclean: Endpoint.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24111,6 +24810,8 @@ realclean: .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp IORInfo.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24205,8 +24906,8 @@ realclean: TAO_Export.h \ corbafwd.i \ PortableInterceptorC.h \ - corbafwd.h \ - DynamicC.h Any.h \ + corbafwd.h DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -24231,8 +24932,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -24247,11 +24948,10 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - PolicyC.h MProfile.h \ - Profile.h \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ + LocalObject.i PolicyC.h \ + MProfile.h Profile.h \ Tagged_Components.h \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ @@ -24264,6 +24964,8 @@ realclean: .obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \ $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24385,19 +25087,830 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Object.h \ + corbafwd.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i Exception.h \ + Exception.i Environment.h \ + Environment.i \ + CORBA_String.h \ + CORBA_String.inl debug.h + +.obj/BiDirPolicyC.o .obj/BiDirPolicyC.so .shobj/BiDirPolicyC.o .shobj/BiDirPolicyC.so: BiDirPolicyC.cpp BiDirPolicyC.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Typecode.h \ + Typecode.i \ + Environment.h \ + Environment.i \ + PolicyC.i BiDirPolicyC.i + +.obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.so .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.so: BiDir_ORBInitializer.cpp \ + BiDir_ORBInitializer.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + PortableInterceptorC.h \ + DynamicC.h \ + Any.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Environment.h \ + Environment.i \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + Any.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + LocalObject.h \ + LocalObject.i \ + BiDir_PolicyFactory.h \ + BiDirPolicyC.h \ + BiDirPolicyC.i \ + ORB_Core.h \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ + Policy_Manager.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Connection_Cache_Manager.h \ + Cache_Entries.h \ + Connection_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Connection_Descriptor_Interface.inl \ + Cache_Entries.inl \ + Connection_Cache_Manager.inl \ + Cleanup_Func_Registry.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i + +.obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.so .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.so: BiDir_PolicyFactory.cpp \ + BiDir_PolicyFactory.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + PortableInterceptorC.h \ + DynamicC.h \ + Any.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Environment.h \ + Environment.i \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + Any.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + IOPC.h \ + IOPC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + LocalObject.h \ + LocalObject.i \ + BiDirPolicyC.h \ + BiDirPolicyC.i \ + BiDir_Policy_i.h \ + BiDir_Policy_i.inl + +.obj/BiDir_Policy_i.o .obj/BiDir_Policy_i.so .shobj/BiDir_Policy_i.o .shobj/BiDir_Policy_i.so: BiDir_Policy_i.cpp \ + BiDir_Policy_i.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + BiDirPolicyC.h \ + TAO_Export.h \ + PolicyC.h \ + CurrentC.h \ Object.h \ corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ + CurrentC.i \ + Encodable.h \ Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ Exception.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Typecode.h \ + Typecode.i \ Environment.h \ Environment.i \ + PolicyC.i \ + BiDirPolicyC.i \ + LocalObject.h \ + LocalObject.i \ + BiDir_Policy_i.inl \ + Stub.h \ + Pluggable.h \ + IOPC.h \ + IOPC.i \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + Pluggable.i \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ + ORB.h \ + Services.h \ + Services.i \ CORBA_String.h \ CORBA_String.inl \ + ORB.i \ + ORB_Core.h \ + Policy_Manager.h \ + Policy_Manager.i \ + Resource_Factory.h \ + Protocol_Factory.h \ + params.h \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + Any.h \ + Any.i \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Connection_Cache_Manager.h \ + Cache_Entries.h \ + Connection_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Connection_Descriptor_Interface.inl \ + Cache_Entries.inl \ + Connection_Cache_Manager.inl \ + Cleanup_Func_Registry.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i \ + Stub.i \ debug.h .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ @@ -24406,6 +25919,8 @@ realclean: Sequence.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24531,6 +26046,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24680,6 +26197,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24937,6 +26456,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24958,8 +26479,7 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Remote_Object_Proxy_Impl.h \ + $(ACE_ROOT)/ace/OS.i Remote_Object_Proxy_Impl.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -25071,8 +26591,7 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i \ + PollableC.i MessagingC.i \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -25210,6 +26729,8 @@ realclean: Priority_Mapping_Manager.i \ TAOC.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -25224,6 +26745,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25508,6 +27031,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25776,6 +27301,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25805,6 +27332,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25950,6 +27479,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26113,6 +27644,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26369,6 +27902,8 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26507,6 +28042,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26648,6 +28185,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26934,6 +28473,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27088,6 +28629,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27242,6 +28785,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27400,6 +28945,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27675,6 +29222,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27778,8 +29327,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i PolicyC.h \ + Sequence_T.cpp IOPC.i \ + PolicyC.h \ CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ @@ -27796,11 +29345,11 @@ realclean: Typecode.i \ Environment.h \ Environment.i \ - PolicyC.i \ - TimeBaseC.h Any.h \ + PolicyC.i TimeBaseC.h \ + Any.h \ Any.i \ - TimeBaseC.i \ - RTCORBAC.i TAOS.h \ + TimeBaseC.i RTCORBAC.i \ + TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -27810,6 +29359,8 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -27831,9 +29382,8 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBAS.h \ - orbconf.h IOPS.h IOPC.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/OS.i RTCORBAS.h orbconf.h \ + IOPS.h IOPC.h TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -27914,8 +29464,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i TimeBaseS.h \ + Sequence_T.cpp IOPC.i \ + IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i TimeBaseS.h \ TimeBaseC.h \ Any.h \ Environment.h \ @@ -27936,21 +29486,21 @@ realclean: TimeBaseS_T.h \ TimeBaseS_T.i \ TimeBaseS_T.cpp \ - TimeBaseS.i \ - RTCORBAC.h corbafwd.h \ - PolicyC.h \ + TimeBaseS.i RTCORBAC.h \ + corbafwd.h PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ - PolicyC.i \ - TimeBaseC.h RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp \ - RTCORBAS.i + PolicyC.i TimeBaseC.h \ + RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp RTCORBAS.i .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp \ RT_PolicyFactory.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28119,6 +29669,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28271,6 +29823,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ orbconf.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28376,6 +29930,8 @@ realclean: $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28512,6 +30068,8 @@ realclean: Pluggable_Messaging_Utils.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28694,6 +30252,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28951,6 +30511,8 @@ realclean: Pluggable_Messaging_Utils.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29084,6 +30646,8 @@ realclean: GIOP_Utils.i \ GIOP_Message_Base.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -29243,6 +30807,8 @@ realclean: Pluggable_Messaging_Utils.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29508,6 +31074,8 @@ realclean: Interceptor_List.inl \ ORB_Core.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ Object_KeyC.h \ Object_KeyC.i \ @@ -29531,6 +31099,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29662,6 +31232,8 @@ realclean: GIOP_Message_Generator_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29786,6 +31358,8 @@ realclean: Tagged_Profile.i \ GIOP_Message_Headers.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ target_specification.i \ operation_details.i \ @@ -29828,6 +31402,8 @@ realclean: GIOP_Message_Generator_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29932,6 +31508,8 @@ realclean: GIOP_Message_Generator_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30058,6 +31636,8 @@ realclean: Tagged_Profile.i \ GIOP_Message_Headers.i \ operation_details.h \ + Service_Context.h \ + Service_Context.inl \ target_specification.h \ target_specification.i \ operation_details.i \ @@ -30100,7 +31680,119 @@ realclean: LocalObject.h \ LocalObject.i \ Priority_Mapping_Manager.i \ - TAOC.i + TAOC.i \ + Pluggable.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + Pluggable.i \ + ORB_Core.h \ + Policy_Manager.h \ + Policy_Manager.i \ + Resource_Factory.h \ + Protocol_Factory.h \ + params.h \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Connection_Cache_Manager.h \ + Cache_Entries.h \ + Connection_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Connection_Descriptor_Interface.inl \ + Cache_Entries.inl \ + Connection_Cache_Manager.inl \ + Cleanup_Func_Registry.h \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i .obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so: \ GIOP_Message_Generator_Parser_Impl.cpp \ @@ -30111,6 +31803,8 @@ realclean: GIOP_Message_Generator_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30216,6 +31910,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30473,6 +32169,8 @@ realclean: Tagged_Profile.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30592,6 +32290,8 @@ realclean: Object_KeyC.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30705,6 +32405,8 @@ realclean: GIOP_Message_State.h \ $(ACE_ROOT)/ace/pre.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -30963,6 +32665,8 @@ realclean: $(ACE_ROOT)/ace/pre.h \ IOPC.h \ TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 8c25f2b3c88..7511b300a63 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "ORB.h" #include "ORB_Table.h" #include "Connector_Registry.h" @@ -42,6 +43,7 @@ # include "Messaging_ORBInitializer.h" /* @@ This should go away! */ #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ +#include "tao/BiDir_ORBInitializer.h" #if defined (TAO_HAS_VALUETYPE) # include "ValueFactory_Map.h" #endif /* TAO_HAS_VALUETYPE */ @@ -68,8 +70,10 @@ using std::set_unexpected; #endif /* ! __ACE_INLINE__ */ + ACE_RCSID(tao, ORB, "$Id$") + static const char ior_prefix [] = "IOR:"; // = Static initialization. @@ -1103,6 +1107,36 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK; #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + + // @@ At presnt we are trying to register the BiDirORB Initializer + // only if the GIOP minor version is greater than or equal to + // 2. The question is -- Do we need this check? This check would + // be good if somebody decides to compile TAO with 1.0 or + // 1.1. But will it save them any foot print? Not really.... + + if (TAO_DEF_GIOP_MINOR >= 2) + { + + PortableInterceptor::ORBInitializer_ptr tmp_orb_initializer = + PortableInterceptor::ORBInitializer::_nil (); + PortableInterceptor::ORBInitializer_var bidir_orb_initializer; + + /// Register the BiDir ORBInitializer. + ACE_NEW_THROW_EX (tmp_orb_initializer, + TAO_BiDir_ORBInitializer, + CORBA::NO_MEMORY ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + bidir_orb_initializer = tmp_orb_initializer; + + PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in (), + ACE_TRY_ENV); + ACE_CHECK; + } // ------------------------------------------------------------- } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 2842c11de59..68c3997c5ac 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -49,6 +49,7 @@ ACE_RCSID(tao, ORB_Core, "$Id$") + // **************************************************************** CORBA::Environment & @@ -152,7 +153,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) #endif /* TAO_HAS_INTERCEPTORS == 1 */ ior_interceptors_ (), parser_registry_ (), - connection_cache_ () + connection_cache_ (), + bidir_giop_policy_ (0) { #if defined(ACE_MVS) ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859); diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index b7ff1805584..c829788c543 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -824,6 +824,14 @@ public: /// Return the underlying connection cache. TAO_Connection_Cache_Manager &connection_cache (void); + /// Set and Get methods to indicate whether a BiDir IIOP policy has + /// been set in the POA. + /// @@ At present, the value will be true even if one of the POA's + /// is set with the Bi Dir GIOP policy. + CORBA::Boolean bidir_giop_policy (void); + void bidir_giop_policy (CORBA::Boolean); + + /** * Return the table that maps object key/name to de-stringified * object reference. The contents of this table do not correspond @@ -1156,6 +1164,8 @@ protected: /// TAO's connection cache. TAO_Connection_Cache_Manager connection_cache_; + /// Bir Dir GIOP policy value + CORBA::Boolean bidir_giop_policy_; }; // **************************************************************** diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index efad67ae024..cd03c48d3f6 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -28,6 +28,19 @@ TAO_ORB_Core::connection_cache (void) return this->connection_cache_; } +ACE_INLINE CORBA::Boolean +TAO_ORB_Core::bidir_giop_policy (void) +{ + return this->bidir_giop_policy_; +} + +ACE_INLINE void +TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val) +{ + this->bidir_giop_policy_ = val; +} + + ACE_INLINE TAO_Object_Ref_Table & TAO_ORB_Core::object_ref_table (void) { @@ -704,7 +717,7 @@ TAO_ORB_Core::add_interceptor ( CORBA_Environment &ACE_TRY_ENV) { this->ior_interceptors_.add_interceptor (interceptor, - ACE_TRY_ENV); + ACE_TRY_ENV); } ACE_INLINE TAO_IORInterceptor_List::TYPE & diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp index 4f5d50131f7..2b05b53dee7 100644 --- a/TAO/tao/Pluggable.cpp +++ b/TAO/tao/Pluggable.cpp @@ -192,6 +192,19 @@ TAO_Transport::messaging_init (CORBA::Octet /*major*/, ACE_NOTSUP_RETURN (-1); } +void +TAO_Transport::bidirectional_flag (int ) +{ + return; +} + +int +TAO_Transport::tear_listen_point_list (TAO_InputCDR & /*cdr*/) +{ + ACE_NOTSUP_RETURN (-1); +} + + // Read the message on the connection. Returns 0 when there is Short // Read on the connection. Returns 1 when the full reply is read and // handled. Returns -1 on errors. If <block> is 1, then reply is diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index 585b37e6baf..fe9afcee201 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -234,6 +234,14 @@ public: virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor); + // Initialising the messaging object. This would be used by the + // connector side. On the acceptor side the connection handler + // would take care of the messaging objects. + + virtual void bidirectional_flag (int flag); + // Set the bidirectional flag + + virtual int tear_listen_point_list (TAO_InputCDR &cdr); void dequeue_all (void); diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index 6e7b19a896a..4d475e51233 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -118,6 +118,7 @@ public: /// Reset teh messaging object virtual void reset (int reset_flag = 1) = 0; + // Reset the messaging object /// Parse the request message, make an upcall and send the reply back /// to the "request initiator" @@ -134,6 +135,11 @@ public: TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params ¶ms, CORBA::Exception &x) = 0; + // Generate a reply message with the exception <ex>. + + virtual int is_ready_for_bidirectional (void) = 0; + // Is the messaging object ready for processing BiDirectional + // request/response? }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index d35c55b6250..2cc561a0f46 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -932,6 +932,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ $(TAO_ROOT)/tao/RTCORBAS.i \ $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/BiDir_Policy_i.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ + $(TAO_ROOT)/tao/BiDir_Policy_i.inl \ Default_Acceptor_Filter.h \ $(TAO_ROOT)/tao/Acceptor_Filter.h \ $(TAO_ROOT)/tao/Acceptor_Filter.i \ @@ -1334,6 +1338,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Stub.h \ @@ -1451,6 +1457,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ @@ -1459,6 +1466,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ @@ -2491,6 +2500,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i .obj/ThruPOA_Object_Proxy_Impl.o .obj/ThruPOA_Object_Proxy_Impl.so .shobj/ThruPOA_Object_Proxy_Impl.o .shobj/ThruPOA_Object_Proxy_Impl.so: ThruPOA_Object_Proxy_Impl.cpp POA.h \ @@ -3129,6 +3140,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -3286,6 +3299,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i \ $(TAO_ROOT)/tao/WrongTransactionC.h \ $(TAO_ROOT)/tao/InterfaceC.h \ @@ -3294,6 +3308,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.i \ Direct_Object_Proxy_Impl.h ThruPOA_Object_Proxy_Impl.h .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ @@ -3845,6 +3861,40 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i \ Collocated_Object.h Collocated_Object.i ServerRequestInfo.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ @@ -3863,31 +3913,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h RTPortableServerC.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Active_Object_Map.h \ + poa_macros.h RTPortableServerC.h RTPortableServerC.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i Object_Adapter.i Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i @@ -4152,6 +4188,40 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/Priority_Mapping.i \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ + $(TAO_ROOT)/tao/TAOC.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/DomainC.i Object_Adapter.h \ Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -4166,34 +4236,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h RTPortableServerC.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Active_Object_Map.h \ + poa_macros.h RTPortableServerC.h RTPortableServerC.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i Object_Adapter.i Operation_Table.h \ $(TAO_ROOT)/tao/PolicyS.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.i \ - $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ @@ -4777,6 +4833,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -5085,6 +5143,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i .obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \ @@ -5384,6 +5444,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 6ef8026c767..3e9d3f17165 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -20,6 +20,8 @@ #include "tao/Acceptor_Registry.h" #include "tao/RT_Policy_i.h" +#include "tao/BiDir_Policy_i.h" + #include "Default_Acceptor_Filter.h" #include "RT_Acceptor_Filters.h" @@ -3885,6 +3887,22 @@ TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy, #endif /* TAO_HAS_RT_CORBA == 1 */ + // Bidirectional policy. If we have a BiDirectional policy, we set a + // flag in the ORB_Core for use by the ORB + + BiDirPolicy::BidirectionalPolicy_var bidir_policy + = BiDirPolicy::BidirectionalPolicy::_narrow (policy, + ACE_TRY_ENV); + ACE_CHECK; + + if (!CORBA::is_nil (bidir_policy.in ())) + { + // Set the flag in the ORB_Core + if (bidir_policy->value () == BiDirPolicy::BOTH) + this->orb_core_.bidir_giop_policy (1); + return; + } + ACE_THROW (PortableServer::POA::InvalidPolicy ()); } diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp new file mode 100644 index 00000000000..bd4fe1fc218 --- /dev/null +++ b/TAO/tao/Service_Context.cpp @@ -0,0 +1,151 @@ +#include "tao/Service_Context.h" + + +ACE_RCSID(tao, Service_Context, "$Id$") + +#if !defined (__ACE_INLINE__) +# include "tao/Service_Context.inl" +#endif /* ! __ACE_INLINE__ */ + + +void +TAO_Service_Context::set_context_i (IOP::ServiceId id, + TAO_OutputCDR &cdr) +{ + IOP::ServiceContext context; + context.context_id = id; + + // Make a *copy* of the CDR stream... + CORBA::ULong length = cdr.total_length (); + context.context_data.length (length); + CORBA::Octet *buf = context.context_data.get_buffer (); + + for (const ACE_Message_Block *i = cdr.begin (); + i != 0; + i = i->cont ()) + { + ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); + buf += i->length (); + } + + this->set_context_i (context); +} + + +void +TAO_Service_Context::set_context_i (IOP::ServiceContext &context, + TAO_OutputCDR &cdr) +{ + // Make a *copy* of the CDR stream... + CORBA::ULong length = cdr.total_length (); + context.context_data.length (length); + CORBA::Octet *buf = context.context_data.get_buffer (); + + for (const ACE_Message_Block *i = cdr.begin (); + i != 0; + i = i->cont ()) + { + ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); + buf += i->length (); + } +} + + +void +TAO_Service_Context::set_context (const IOP::ServiceContext &context) +{ + this->add_context_i (context); +} + +void +TAO_Service_Context::set_context (IOP::ServiceContext &context) +{ + this->add_context_i (context); +} + +void +TAO_Service_Context::set_context_i (const IOP::ServiceContext& context) +{ + // @@ TODO Some contexts can show up multiple times, others + // can't find out and take appropiate action. + for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i) + { + if (context.context_id == this->service_context_[i].context_id) + { + this->service_context_[i] = context; + return; + } + } + this->add_context_i (context); +} + +void +TAO_Service_Context::set_context_i (IOP::ServiceContext& context) +{ + for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i) + { + if (context.context_id == this->service_context_[i].context_id) + { + CORBA::ULong max = context.context_data.maximum (); + CORBA::ULong len = context.context_data.length (); + CORBA::Octet* buf = context.context_data.get_buffer (1); + this->service_context_[i].context_data.replace (max, len, buf, 1); + return; + } + } + this->add_context_i (context); +} + +void +TAO_Service_Context::add_context_i (IOP::ServiceContext& context) +{ + // @@ TODO Some contexts can show up multiple times, others + // can't find out and take appropiate action. + CORBA::ULong l = this->service_context_.length (); + this->service_context_.length (l + 1); + this->service_context_[l].context_id = context.context_id; + CORBA::ULong max = context.context_data.maximum (); + CORBA::ULong len = context.context_data.length (); + CORBA::Octet* buf = context.context_data.get_buffer (1); + this->service_context_[l].context_data.replace (max, len, buf, 1); +} + +void +TAO_Service_Context::add_context_i (const IOP::ServiceContext& context) +{ + // @@ TODO Some contexts can show up multiple times, others + // can't find out and take appropiate action. + CORBA::ULong l = this->service_context_.length (); + this->service_context_.length (l + 1); + this->service_context_[l] = context; +} + +int +TAO_Service_Context::get_context (IOP::ServiceContext& context) const +{ + for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i) + { + if (context.context_id == this->service_context_[i].context_id) + { + context = this->service_context_[i]; + return 1; + } + } + return 0; +} + + +int +TAO_Service_Context::encode (TAO_OutputCDR& cdr) const +{ + return (cdr << this->service_context_); +} + +int +TAO_Service_Context::decode (TAO_InputCDR& cdr) +{ + if ((cdr >> this->service_context_) == 0) + return 0; + + return 1; +} diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h new file mode 100644 index 00000000000..0581de8d8aa --- /dev/null +++ b/TAO/tao/Service_Context.h @@ -0,0 +1,125 @@ +// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- + +// =================================================================== +/** + * @file Service_Context.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + * + */ +// =================================================================== + +#ifndef TAO_SERVICE_CONTEXT_H +#define TAO_SERVICE_CONTEXT_H +#include "ace/pre.h" + +#include "tao/IOPC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +/** + * @class Service_Context.h + * + * @brief Helper class for managing the service context list + * information. + * + * This class is used to manipulate and access the service context + * list that is passed around with every GIOP request/reply. The + * definition of the service context list is simply a sequence of the + * following structures: + * typedef unsigned long ServiceId; + * struct ServiceContext + * { + * ServiceId context_id; + * sequence <octet> context_data; + * }; + * typedef sequence <ServiceContext> ServiceContextList; + * + * the real motivation behind this class is to consolidate all the + * marshalling and unmarshalling information pertaining to service + * context list + * + * Note: Somewhere down the line we may want to use this class for + * fast access to the info that we need from the Service Context + * List. + */ + + +class TAO_Export TAO_Service_Context +{ +public: + /// Constructor + TAO_Service_Context (void); + + + /// = Generic components + + /// Insert the component into the list, making a copy of the octet + /// sequence. + void set_context (const IOP::ServiceContext &context); + + /// Insert the component into the list, but efficiently stealing the + /// contents of the octet sequence. + void set_context (IOP::ServiceContext &context); + + /// Get a copy of the context identified by <context.context_id>, return + /// 0 if the component is not present. + int get_context (IOP::ServiceContext &context) const; + + /// Set the context from the CDR stream and add that to the service + /// Context list + void set_context (IOP::ServiceId id, TAO_OutputCDR &cdr); + + /// Set the context from the CDR stream and return the context back + /// to the caller. *Does not* modify the underlying service context + /// list. + void set_context (IOP::ServiceContext &context, TAO_OutputCDR &cdr); + + /// Is the <id> available in the underlying service context list? If + /// so return 1, else return 0 + int is_service_id (IOP::ServiceId id); + + /// = Marshaling and demarshaling the list + int encode (TAO_OutputCDR& cdr) const; + int decode (TAO_InputCDR& cdr); + + /// Return the underlying service context list + IOP::ServiceContextList &service_info (void); + const IOP::ServiceContextList &service_info (void) const; + + // @@ Note: The above method is only for backward comptiblity. We + // need to get this removed once RT folks have their service + // addition info done through this interface + +private: + + /// Helper methods to implement set_context() + void set_context_i (const IOP::ServiceContext &context); + void set_context_i (IOP::ServiceContext &context); + void add_context_i (const IOP::ServiceContext &context); + void add_context_i (IOP::ServiceContext &context); + void set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr); + void set_context_i (IOP::ServiceContext &context, TAO_OutputCDR &cdr); + + /// Helper methods to implement set_context() + int get_context_i (IOP::ServiceContext &context) const; + +private: + + /// The ServiceContextList info + IOP::ServiceContextList service_context_; +}; + +#if defined (__ACE_INLINE__) +# include "tao/Service_Context.inl" +#endif /* ! __ACE_INLINE__ */ + + +#include "ace/post.h" +#endif /* TAO_SERVICE_CONTEXT_H */ diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl new file mode 100644 index 00000000000..d7540db80b7 --- /dev/null +++ b/TAO/tao/Service_Context.inl @@ -0,0 +1,54 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE +TAO_Service_Context::TAO_Service_Context (void) + : service_context_ () +{ +} + +ACE_INLINE IOP::ServiceContextList & +TAO_Service_Context::service_info (void) +{ + return this->service_context_; +} + +ACE_INLINE const IOP::ServiceContextList & +TAO_Service_Context::service_info (void) const +{ + return this->service_context_; +} + + +ACE_INLINE void +TAO_Service_Context::set_context (IOP::ServiceId id, + TAO_OutputCDR &cdr) +{ + this->set_context_i (id, + cdr); +} + +ACE_INLINE void +TAO_Service_Context::set_context (IOP::ServiceContext &context, + TAO_OutputCDR &cdr) +{ + this->set_context_i (context, + cdr); +} + + +ACE_INLINE int +TAO_Service_Context::is_service_id (IOP::ServiceId id) +{ + for (CORBA::ULong i = 0; + i != this->service_context_.length (); + ++i) + { + if (id == this->service_context_[i].context_id) + { + return 1; + } + } + return 0; +} diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile index 202d5cc002f..ce9f38ae368 100644 --- a/TAO/tao/SmartProxies/Makefile +++ b/TAO/tao/SmartProxies/Makefile @@ -50,8 +50,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Smart_Proxies.o .obj/Smart_Proxies.so .shobj/Smart_Proxies.o .shobj/Smart_Proxies.so: Smart_Proxies.cpp Smart_Proxies.h \ - $(ACE_ROOT)/ace/pre.h \ - smartproxies_export.h \ + $(ACE_ROOT)/ace/pre.h smartproxies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -151,7 +152,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - Smart_Proxies.inl + $(TAO_ROOT)/tao/Object.i Smart_Proxies.inl # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 6d1d2ab478b..081f4811aea 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -86,6 +86,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -201,8 +203,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - UIOP_Acceptor.h \ - $(TAO_ROOT)/tao/Pluggable.h \ + UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -390,8 +391,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ + UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -402,8 +402,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.cpp .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - strategies_export.h \ + $(ACE_ROOT)/ace/pre.h strategies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -521,8 +522,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - UIOP_Acceptor.h \ - $(TAO_ROOT)/tao/Pluggable.h \ + UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -710,8 +710,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Connector.h \ - $(ACE_ROOT)/ace/Connector.h \ + UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -730,6 +729,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -962,8 +963,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -978,8 +978,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/Wait_Strategy.h \ UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \ - UIOP_Profile.i \ - $(TAO_ROOT)/tao/ORB.h \ + UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -1034,14 +1033,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/debug.h \ - uiop_endpoints.h uiop_endpoints.i + $(TAO_ROOT)/tao/debug.h uiop_endpoints.h \ + uiop_endpoints.i .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1251,8 +1252,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i UIOP_Connection_Handler.h \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ + UIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -1389,6 +1390,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1608,8 +1611,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - UIOP_Transport.i \ - $(ACE_ROOT)/ace/Acceptor.h \ + UIOP_Transport.i $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ @@ -1628,8 +1630,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.h \ $(TAO_ROOT)/tao/Connector_Impl.inl \ $(TAO_ROOT)/tao/Connector_Impl.cpp \ - UIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -1733,6 +1734,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2036,8 +2039,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - UIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -2069,12 +2071,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.i .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \ - UIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ + UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \ UIOP_Transport.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2284,8 +2287,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -2392,6 +2394,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2486,12 +2490,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Endpoint.i \ - strategies_export.h \ - $(ACE_ROOT)/ace/UNIX_Addr.h \ + strategies_export.h $(ACE_ROOT)/ace/UNIX_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/UNIX_Addr.i \ - UIOP_Endpoint.i UIOP_Connection_Handler.h UIOP_Transport.h \ + $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \ + UIOP_Connection_Handler.h UIOP_Transport.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -2604,8 +2607,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - UIOP_Transport.i \ + $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -2624,6 +2626,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2837,8 +2841,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - SHMIOP_Transport.h \ - $(ACE_ROOT)/ace/MEM_Stream.h \ + SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \ $(ACE_ROOT)/ace/MEM_IO.h \ $(ACE_ROOT)/ace/MEM_SAP.h \ $(ACE_ROOT)/ace/PI_Malloc.h \ @@ -2849,8 +2852,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ $(ACE_ROOT)/ace/MEM_IO.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \ @@ -2954,6 +2957,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3103,9 +3108,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -3229,6 +3233,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3475,16 +3481,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h \ - $(TAO_ROOT)/tao/ORB.h \ + SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ @@ -3577,6 +3582,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3822,8 +3829,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connector_Impl.h \ $(TAO_ROOT)/tao/Connector_Impl.inl \ $(TAO_ROOT)/tao/Connector_Impl.cpp \ - SHMIOP_Profile.h \ - $(TAO_ROOT)/tao/Profile.h \ + SHMIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ @@ -3845,15 +3851,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h \ - $(TAO_ROOT)/tao/ORB.h \ + SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - SHMIOP_Endpoint.i SHMIOP_Profile.i \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/ORB.i SHMIOP_Endpoint.i \ + SHMIOP_Profile.i $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -3909,6 +3913,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4131,8 +4137,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/PI_Malloc.i \ $(ACE_ROOT)/ace/MEM_SAP.i \ $(ACE_ROOT)/ace/MEM_IO.i \ - $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(ACE_ROOT)/ace/MEM_Stream.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \ @@ -4240,6 +4246,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4560,16 +4568,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ $(TAO_ROOT)/tao/Base_Connection_Property.inl \ - SHMIOP_Endpoint.h \ - $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i + SHMIOP_Endpoint.h $(ACE_ROOT)/ace/MEM_Addr.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i .obj/SHMIOP_Endpoint.o .obj/SHMIOP_Endpoint.so .shobj/SHMIOP_Endpoint.o .shobj/SHMIOP_Endpoint.so: SHMIOP_Endpoint.cpp SHMIOP_Endpoint.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4664,8 +4672,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Endpoint.i \ - strategies_export.h \ - $(TAO_ROOT)/tao/ORB.h \ + strategies_export.h $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -4705,8 +4712,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ - $(ACE_ROOT)/ace/MEM_Addr.i \ - SHMIOP_Endpoint.i SHMIOP_Connection_Handler.h \ + $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ + SHMIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ @@ -4796,8 +4803,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - SHMIOP_Transport.h \ - $(ACE_ROOT)/ace/MEM_Stream.h \ + SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \ $(ACE_ROOT)/ace/MEM_IO.h \ $(ACE_ROOT)/ace/MEM_SAP.h \ $(ACE_ROOT)/ace/PI_Malloc.h \ @@ -4817,10 +4823,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/debug.h .obj/TAO_Strategies_Internal.o .obj/TAO_Strategies_Internal.so .shobj/TAO_Strategies_Internal.o .shobj/TAO_Strategies_Internal.so: TAO_Strategies_Internal.cpp \ - TAO_Strategies_Internal.h \ - $(ACE_ROOT)/ace/pre.h \ + TAO_Strategies_Internal.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5081,6 +5088,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5200,12 +5209,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - uiop_endpoints.i + $(TAO_ROOT)/tao/Any.i uiop_endpoints.i .obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \ - $(ACE_ROOT)/ace/pre.h \ - strategies_export.h \ + $(ACE_ROOT)/ace/pre.h strategies_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5500,11 +5509,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/TP_Reactor.i .obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.so .shobj/Reactor_Per_Priority.o .shobj/Reactor_Per_Priority.so: Reactor_Per_Priority.cpp \ - Reactor_Per_Priority.h \ - $(ACE_ROOT)/ace/pre.h \ + Reactor_Per_Priority.h $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/Reactor_Registry.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5764,6 +5774,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5785,8 +5797,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Linear_Priority_Mapping.h \ + $(ACE_ROOT)/ace/OS.i Linear_Priority_Mapping.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -5906,6 +5917,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5927,8 +5940,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - Direct_Priority_Mapping.h \ + $(ACE_ROOT)/ace/OS.i Direct_Priority_Mapping.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/corbafwd.h \ diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index c8a3f4baf7f..6c1c016bc0c 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -404,6 +404,82 @@ SOURCE=.\Base_Connection_Property.cpp # End Source File
# Begin Source File
+SOURCE=.\BiDir_ORBInitializer.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -1487,6 +1563,25 @@ SOURCE=.\IIOP_Transport.cpp # End Source File
# Begin Source File
+SOURCE=.\IIOPC.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -2798,6 +2893,25 @@ SOURCE=.\Service_Callbacks.cpp # End Source File
# Begin Source File
+SOURCE=.\Service_Context.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -3389,6 +3503,22 @@ SOURCE=.\Base_Connection_Property.h # End Source File
# Begin Source File
+SOURCE=.\BiDir_ORBInitializer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.h
# End Source File
# Begin Source File
@@ -3641,6 +3771,10 @@ SOURCE=.\IIOP_Transport.h # End Source File
# Begin Source File
+SOURCE=.\IIOPC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.h
# End Source File
# Begin Source File
@@ -3949,6 +4083,10 @@ SOURCE=.\Service_Callbacks.h # End Source File
# Begin Source File
+SOURCE=.\Service_Context.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.h
# End Source File
# Begin Source File
@@ -4121,6 +4259,14 @@ SOURCE=.\Base_Connection_Property.i # End Source File
# Begin Source File
+SOURCE=.\BiDir_Policy_i.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.i
# End Source File
# Begin Source File
@@ -4145,10 +4291,6 @@ SOURCE=.\Client_Priority_Policy.i # End Source File
# Begin Source File
-SOURCE=.\ClientRequestInfo.inl
-# End Source File
-# Begin Source File
-
SOURCE=.\Connection_Cache_Manager.i
# End Source File
# Begin Source File
@@ -4321,6 +4463,10 @@ SOURCE=.\IIOP_Transport.i # End Source File
# Begin Source File
+SOURCE=.\IIOPC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.inl
# End Source File
# Begin Source File
@@ -4553,6 +4699,10 @@ SOURCE=.\Service_Callbacks.i # End Source File
# Begin Source File
+SOURCE=.\Service_Context.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.i
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index e8b95ffa817..9cd6284fded 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -20,7 +20,7 @@ # include "tao/TAO_Server_Request.i" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID(tao, GIOP_Server_Request, "$Id$") +ACE_RCSID(tao, TAO_Server_Request, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) @@ -132,7 +132,7 @@ TAO_ServerRequest::init_reply (void) // Pass in the service context list. We are sending back what we // received in the Request. (RTCORBA relies on it. Check before // modifying...) marina - reply_params.service_context_notowned (&this->service_info_); + reply_params.service_context_notowned (&this->service_info ()); // Are we going to marshall any data with the reply? reply_params.argument_flag_ = this->argument_flag_; @@ -187,7 +187,7 @@ TAO_ServerRequest::send_no_exception_reply (void) // Pass in the service context list. We are sending back what we // received in the Request. (RTCORBA relies on it. Check before // modifying...) marina - reply_params.service_context_notowned (&this->service_info_); + reply_params.service_context_notowned (&this->service_info ()); reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION; diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 462f5e169f6..09818972ee9 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -29,10 +29,9 @@ #include "ace/SString.h" #include "tao/ORB.h" -//#include "tao/Principal.h" -//#include "tao/GIOP_Message_Base.h" #include "tao/Tagged_Profile.h" #include "tao/OctetSeqC.h" +#include "tao/Service_Context.h" class TAO_Pluggable_Messaging; class TAO_Transport; @@ -126,6 +125,13 @@ public: IOP::ServiceContextList &service_info (void); void service_info (IOP::ServiceContextList &service_info); + // @@ The above two should go away... + + TAO_Service_Context &service_context (void); + // Return the TAO_Service_Context + + TAO_Transport *transport (); + // Return the underlying transport // To handle System Exceptions at the lowest level, // a method returning the request_id_ is needed. @@ -206,11 +212,15 @@ private: /// A pointer to the ORB Core for the context where the request was /// created. TAO_ORB_Core *orb_core_; + // A pointer to the ORB Core for the context where the request was + // created. + + //IOP::ServiceContextList service_info_; + // The service context for the request (CORBA Reference?). - /// The service context for the request (CORBA Reference?). - IOP::ServiceContextList service_info_; + TAO_Service_Context service_context_; + // Service Context info - /// Unique identifier for a request. CORBA::ULong request_id_; /// The tagged profile that has the addressing information. diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i index dd0418f1bfd..58235cdcbda 100644 --- a/TAO/tao/TAO_Server_Request.i +++ b/TAO/tao/TAO_Server_Request.i @@ -83,15 +83,28 @@ TAO_ServerRequest::object_key (void) ACE_INLINE IOP::ServiceContextList & TAO_ServerRequest::service_info (void) { - return this->service_info_; + return this->service_context_.service_info (); } ACE_INLINE void TAO_ServerRequest::service_info (IOP::ServiceContextList &service_info) { - this->service_info_ = service_info; + this->service_context_.service_info () = service_info; } +ACE_INLINE TAO_Service_Context & +TAO_ServerRequest::service_context (void) +{ + return this->service_context_; +} + +ACE_INLINE TAO_Transport * +TAO_ServerRequest::transport (void) +{ + return this->transport_; +} + + ACE_INLINE CORBA::ULong TAO_ServerRequest::request_id (void) { diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index a0f015fe68b..f98b91c293b 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -123,6 +123,22 @@ SOURCE=.\Base_Connection_Property.h # End Source File
# Begin Source File
+SOURCE=.\BiDir_ORBInitializer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.h
# End Source File
# Begin Source File
@@ -363,6 +379,10 @@ SOURCE=.\IIOP_Transport.h # End Source File
# Begin Source File
+SOURCE=.\IIOPC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.h
# End Source File
# Begin Source File
@@ -671,6 +691,10 @@ SOURCE=.\Service_Callbacks.h # End Source File
# Begin Source File
+SOURCE=.\Service_Context.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.h
# End Source File
# Begin Source File
@@ -839,6 +863,14 @@ SOURCE=.\Base_Connection_Property.i # End Source File
# Begin Source File
+SOURCE=.\BiDir_Policy_i.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.i
# End Source File
# Begin Source File
@@ -867,10 +899,6 @@ SOURCE=.\Client_Priority_Policy.i # End Source File
# Begin Source File
-SOURCE=.\ClientRequestInfo.inl
-# End Source File
-# Begin Source File
-
SOURCE=.\Connection_Cache_Manager.i
# End Source File
# Begin Source File
@@ -1047,6 +1075,10 @@ SOURCE=.\IIOP_Transport.i # End Source File
# Begin Source File
+SOURCE=.\IIOPC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.inl
# End Source File
# Begin Source File
@@ -1279,6 +1311,10 @@ SOURCE=.\Service_Callbacks.i # End Source File
# Begin Source File
+SOURCE=.\Service_Context.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.i
# End Source File
# Begin Source File
@@ -1423,6 +1459,22 @@ SOURCE=.\Base_Connection_Property.cpp # End Source File
# Begin Source File
+SOURCE=.\BiDir_ORBInitializer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_Policy_i.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDir_PolicyFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\BiDirPolicyC.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Bind_Dispatcher_Guard.cpp
# End Source File
# Begin Source File
@@ -1651,6 +1703,10 @@ SOURCE=.\IIOP_Transport.cpp # End Source File
# Begin Source File
+SOURCE=.\IIOPC.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Interceptor_List.cpp
# End Source File
# Begin Source File
@@ -1927,6 +1983,10 @@ SOURCE=.\Service_Callbacks.cpp # End Source File
# Begin Source File
+SOURCE=.\Service_Context.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Services.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 74834ab39fc..f1b227493e7 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -86,6 +86,7 @@ #include "tao/PortableInterceptor.h" /* This needs to remain visible. */ #include "tao/ClientRequestInfo.h" +#include "tao/BiDirPolicyC.h" #if !defined (ACE_NESTED_CLASS) #if defined (ACE_WIN32) diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 5da4289ce99..9fd29f9542b 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -13,11 +13,17 @@ #ifndef TAO_OPERATION_DETAILS_H #define TAO_OPERATION_DETAILS_H #include "ace/pre.h" - #include "tao/corbafwd.h" -#include "tao/IOPC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +#include "tao/Service_Context.h" #include "tao/target_specification.h" + // @@ Bala: Why is this not part of the RequestHeader?! /** * @class TAO_Operation_Details @@ -29,6 +35,7 @@ * infancy now but I expect this one to grow as we come with * different varieties of use cases. */ + class TAO_Export TAO_Operation_Details { public: @@ -58,6 +65,10 @@ public: IOP::ServiceContextList &service_info (void); const IOP::ServiceContextList &service_info (void) const; + /// Access the TAO_Service_Context + TAO_Service_Context &service_context (void); + const TAO_Service_Context &service_context (void) const; + void request_id (CORBA::ULong id); /// Get for request id @@ -93,9 +104,9 @@ private: /// Response flags CORBA::Octet response_flags_; - /// The ServiceContextList sent to the server side. Only valid + /// The ServiceContextList sent to the server side. Only valid /// when sending a request. - IOP::ServiceContextList service_info_; + TAO_Service_Context service_info_; // The first element of header is service context list; // transactional context would be acquired here using the @@ -103,7 +114,7 @@ private: // undefined. // - /// Addressing mode for this request. + /// Addressing mode for this request. TAO_Target_Specification::TAO_Target_Address addressing_mode_; }; diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i index 4934a77ceed..cd293deb628 100644 --- a/TAO/tao/operation_details.i +++ b/TAO/tao/operation_details.i @@ -35,15 +35,30 @@ TAO_Operation_Details::argument_flag (void) const ACE_INLINE IOP::ServiceContextList & TAO_Operation_Details::service_info (void) { - return this->service_info_; + // @@ This should go ... + return this->service_info_.service_info (); } ACE_INLINE const IOP::ServiceContextList & TAO_Operation_Details::service_info (void) const { + // @@ This should go ... + return this->service_info_.service_info (); +} + +ACE_INLINE TAO_Service_Context & +TAO_Operation_Details::service_context (void) +{ return this->service_info_; } +ACE_INLINE const TAO_Service_Context & +TAO_Operation_Details::service_context (void) const +{ + return this->service_info_; +} + + ACE_INLINE void TAO_Operation_Details::request_id (CORBA::ULong id) { |