diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-19 03:00:43 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-19 03:00:43 +0000 |
| commit | 68d762e3aaa0aecb4153d37d9a58b11c3d8e6687 (patch) | |
| tree | c38a582b9d2f194fbdfe27cc1807daeec8329826 /TAO/tao | |
| parent | 9acc98a6d1a9965b8d5a9326e1762701817f4ae7 (diff) | |
| download | ATCD-68d762e3aaa0aecb4153d37d9a58b11c3d8e6687.tar.gz | |
ChangeLogTag: Mon Dec 18 18:37:53 2000 Priyanka Gontla <pgontla@ece.uci.edu>
Diffstat (limited to 'TAO/tao')
41 files changed, 7325 insertions, 3184 deletions
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp new file mode 100644 index 00000000000..57e246ee8da --- /dev/null +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -0,0 +1,119 @@ +// $Id$ + +#include "Default_Protocols_Hooks.h" +#include "ace/Dynamic_Service.h" + +#if !defined (__ACE_INLINE__) +# include "Default_Protocols_Hooks.i" +#endif /* ! __ACE_INLINE__ */ + +ACE_RCSID(tao, Default_Protocols_Hooks, "$Id$"); + +/// constructor +TAO_Default_Protocols_Hooks::TAO_Default_Protocols_Hooks (void) +{ +} + +/// destructor +TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void) +{ +} + +int +TAO_Default_Protocols_Hooks::call_client_protocols_hook ( + TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *) +{ + return 0; +} + +int +TAO_Default_Protocols_Hooks::call_server_protocols_hook ( + TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *) +{ + return 0; +} + +void +TAO_Default_Protocols_Hooks::call_policy_type_hook ( + CORBA::PolicyList *&, + CORBA::ULong &) +{ + return; +} + +void +TAO_Default_Protocols_Hooks::validate_policy_type (CORBA::ULong, + CORBA::ULong &, + CORBA::Environment &) +{ + return; +} + +void +TAO_Default_Protocols_Hooks::add_rt_service_context_hook ( + TAO_GIOP_Invocation *, + CORBA::Policy *, + CORBA::Short &, + CORBA::Environment &) +{ + return; +} + +void +TAO_Default_Protocols_Hooks::get_selector_hook (CORBA::Policy *, + CORBA::Boolean &, + CORBA::Short &) +{ + return; +} + +void +TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook ( + CORBA::Policy *, + CORBA::Short &, + CORBA::Short &, + CORBA::Short &, + int &) +{ + return; +} + +void +TAO_Default_Protocols_Hooks::select_endpoint_hook ( + TAO_GIOP_Invocation *, + CORBA::Policy *, + TAO_Profile *&, + CORBA::Environment &) +{ + return; +} + +CORBA::Policy * +TAO_Default_Protocols_Hooks::effective_priority_banded_connection_hook (CORBA::Policy *, + CORBA::Policy *, + CORBA::Environment &) +{ + return CORBA::Policy::_nil (); +} + +CORBA::Policy * +TAO_Default_Protocols_Hooks::effective_client_protocol_hook (CORBA::Policy *, + CORBA::Policy *, + CORBA::Environment &) +{ + return CORBA::Policy::_nil (); +} + +// **************************************************************** + +ACE_STATIC_SVC_DEFINE (TAO_Default_Protocols_Hooks, + ACE_TEXT ("Protocol_Hooks"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_Default_Protocols_Hooks), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO, TAO_Default_Protocols_Hooks) diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h new file mode 100644 index 00000000000..af056b841fc --- /dev/null +++ b/TAO/tao/Default_Protocols_Hooks.h @@ -0,0 +1,98 @@ +// -*- C++ -*- + +// =================================================================== +/** + * @file Default_Protocols_Hooks.h + * + * $Id$ + * + * @author Priyanka Gontla <pgontla@ece.uci.edu> + */ +// =================================================================== + +#ifndef TAO_DEFAULT_PROTOCOLS_HOOKS_H +#define TAO_DEFAULT_PROTOCOLS_HOOKS_H +#include "ace/pre.h" + +#include "Protocols_Hooks.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Service_Config.h" + +class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks +{ + public: + + TAO_Default_Protocols_Hooks (void); + + /// Destructor + virtual ~TAO_Default_Protocols_Hooks (void); + + virtual int + call_client_protocols_hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type); + + virtual int + call_server_protocols_hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type); + + virtual void call_policy_type_hook (CORBA::PolicyList *&policy_list, + CORBA::ULong &policy_type); + + virtual void validate_policy_type (CORBA::ULong slot, + CORBA::ULong &type_value, + CORBA::Environment &ACE_TRY_ENV); + + virtual void add_rt_service_context_hook ( + TAO_GIOP_Invocation *invocation, + CORBA::Policy *model_policy, + CORBA::Short &client_priority, + CORBA::Environment &ACE_TRY_ENV); + + virtual void get_selector_hook (CORBA::Policy *model_policy, + CORBA::Boolean + &is_client_propagated, + CORBA::Short &server_priority); + + virtual void get_selector_bands_policy_hook ( + CORBA::Policy + *bands_policy, + CORBA::Short &min_priority, + CORBA::Short &max_priority, + CORBA::Short &p, + int &in_range); + + virtual void select_endpoint_hook (TAO_GIOP_Invocation *invocation, + CORBA::Policy *client_protocol_policy, + TAO_Profile *&profile, + CORBA::Environment &ACE_TRY_ENV); + + /** + * Hook to check and override the exposed policies if needed + * + */ + virtual CORBA::Policy *effective_priority_banded_connection_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); + + virtual CORBA::Policy *effective_client_protocol_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); +}; + +#if defined (__ACE_INLINE__) +#include "tao/Default_Protocols_Hooks.i" +#endif /* __ACE_INLINE__ */ + +ACE_STATIC_SVC_DECLARE (TAO_Default_Protocols_Hooks) +ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks) + +#include "ace/post.h" +#endif /* TAO_DEFAULT_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/Default_Protocols_Hooks.i b/TAO/tao/Default_Protocols_Hooks.i new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/tao/Default_Protocols_Hooks.i @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 8b24988f6fc..8dfed59b008 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -63,8 +63,6 @@ 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/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 +342,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -356,8 +374,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -384,14 +400,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -671,6 +684,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -683,8 +716,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -711,18 +742,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ + $(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 \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1002,6 +1030,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1014,8 +1062,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1042,14 +1088,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1329,6 +1372,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1341,8 +1404,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1369,17 +1430,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/BiDirPolicyC.i DynamicAnyC.i \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.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 \ @@ -1401,8 +1459,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 DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i DynamicAny.h dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1658,6 +1715,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1670,8 +1747,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1698,16 +1773,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/BiDirPolicyC.i DynamicAnyC.i \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1987,6 +2058,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1999,8 +2090,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2027,14 +2116,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2314,6 +2400,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2326,8 +2432,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2354,16 +2458,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/BiDirPolicyC.i DynamicAnyC.i \ + DynAnyFactory.h $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .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/pre.h DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2643,6 +2743,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2655,8 +2775,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2683,15 +2801,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/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/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 \ @@ -2971,6 +3087,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2983,8 +3119,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -3011,7 +3145,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.i \ - DynamicAnyC.i + $(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 61e5abc1d3d..3cbeb07e686 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -58,12 +58,9 @@ CPPFLAGS += -I$(TAO_ROOT) # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp Context.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp Context.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 \ @@ -204,8 +201,6 @@ 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 \ @@ -302,24 +297,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Object.h \ - $(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 \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -327,71 +306,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(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/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(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/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.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/Asynch_Invocation.h \ - $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ - $(TAO_ROOT)/tao/Asynch_Invocation.i \ - DII_Reply_Dispatcher.h dynamicinterface_export.h Request.h Context.h \ - Context.inl ExceptionList.h ExceptionList.inl \ - $(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 \ - $(TAO_ROOT)/tao/NVList.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 \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -452,8 +374,38 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Pluggable.i \ + $(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/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(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 \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.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/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 \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ @@ -469,7 +421,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ @@ -493,8 +458,57 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(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/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/Asynch_Invocation.i \ + DII_Reply_Dispatcher.h dynamicinterface_export.h Request.h Context.h \ + Context.inl ExceptionList.h ExceptionList.inl \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i Request.inl \ + DII_Invocation.inl Unknown_User_Exception.h \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ @@ -506,8 +520,6 @@ CPPFLAGS += -I$(TAO_ROOT) 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 \ @@ -765,6 +777,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i @@ -774,8 +806,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -890,8 +920,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 \ @@ -955,42 +985,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - $(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/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ - $(TAO_ROOT)/tao/TAOC.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(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/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ + Server_Request.inl $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -1033,6 +1029,22 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Pluggable.i \ + $(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/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ @@ -1070,15 +1082,50 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(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/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.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 \ $(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 \ @@ -1228,8 +1275,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ + Server_Request.inl $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ @@ -1344,6 +1390,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/PortableServer/POA.h \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ @@ -1364,8 +1430,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ @@ -1381,8 +1445,6 @@ 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 \ @@ -1486,12 +1548,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i -.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp Request.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp Request.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 \ @@ -1638,21 +1697,151 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i Request.inl \ - DII_Invocation.h \ - $(TAO_ROOT)/tao/Invocation.h \ + DII_Invocation.h $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/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 \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(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/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ $(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/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1664,14 +1853,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Asynch_Invocation.h \ @@ -1686,8 +1867,6 @@ 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 \ @@ -1842,4 +2021,121 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Marshal.i +.obj/Unknown_User_Exception.o .obj/Unknown_User_Exception.so .shobj/Unknown_User_Exception.o .shobj/Unknown_User_Exception.so: Unknown_User_Exception.cpp \ + Unknown_User_Exception.h $(ACE_ROOT)/ace/pre.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 \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/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 \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(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 \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index a5c1e41fec0..76f519af514 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -8,7 +8,7 @@ #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" -#include "tao/RT_Policy_i.h" +#include "tao/Protocols_Hooks.h" #include "ace/Auto_Ptr.h" @@ -760,60 +760,42 @@ TAO_IIOP_Acceptor::init_tcp_properties (void) // ServerProtocolProperties policy controls protocols configuration. // Look for protocol properties in the effective ServerProtocolPolicy. - TAO_ServerProtocolPolicy *server_protocols = - this->orb_core_->server_protocol (); - // Automatically release the policy. - CORBA::Object_var auto_release = server_protocols; - RTCORBA::TCPProtocolProperties_var tcp_properties = - RTCORBA::TCPProtocolProperties::_nil (); - RTCORBA::ProtocolList & protocols = server_protocols->protocols_rep (); - // Find protocol properties for TCP. ACE_DECLARE_NEW_CORBA_ENV; - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) - { - tcp_properties = - RTCORBA::TCPProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - if (CORBA::is_nil (tcp_properties.in ())) + RTCORBA::ProtocolProperties_var properties = + RTCORBA::ProtocolProperties::_nil (); + + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (); + + if (tph != 0) { - // TCP Properties were not specified in the effective policy. - // We must use orb defaults. - - server_protocols = this->orb_core_->default_server_protocol (); - // Automatically release the policy. - auto_release = server_protocols; - // Find protocol properties for IIOP. - RTCORBA::ProtocolList & protocols = server_protocols->protocols_rep (); - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) - { - tcp_properties = - RTCORBA::TCPProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - - // Orb defaults should never be null, since the ORB initializes - // them in ORB_init ... - } + const char protocol [] = "iiop"; + const char *protocol_type = protocol; - // Extract and locally store properties of interest. - this->tcp_properties_.send_buffer_size = - tcp_properties->send_buffer_size (); - this->tcp_properties_.recv_buffer_size = - tcp_properties->recv_buffer_size (); - this->tcp_properties_.no_delay = - tcp_properties->no_delay (); + int hook_return = + tph->call_server_protocols_hook (this->orb_core_, + properties, + protocol_type); + + if (hook_return == -1) + return -1; + } + RTCORBA::TCPProtocolProperties_var tcp_properties = + RTCORBA::TCPProtocolProperties::_narrow (properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (!CORBA::is_nil (tcp_properties.in ())) + { // Extract and locally store properties of interest. + this->tcp_properties_.send_buffer_size = + tcp_properties->send_buffer_size (); + this->tcp_properties_.recv_buffer_size = + tcp_properties->recv_buffer_size (); + this->tcp_properties_.no_delay = + tcp_properties->no_delay (); + } // @@ NOTE. RTCORBA treats a combination of transport+messaging // as a single protocol. Keep this in mind for when we adopt // RTCORBA approach to protocols configuration for nonRT use. In diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index fb4115ad299..d9bcf979eeb 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -10,13 +10,12 @@ #include "tao/Client_Strategy_Factory.h" #include "tao/Environment.h" #include "ace/Auto_Ptr.h" -#include "tao/RT_Policy_i.h" #include "tao/Base_Connection_Property.h" +#include "tao/Protocols_Hooks.h" #include "ace/Strategies_T.h" ACE_RCSID(tao, IIOP_Connector, "$Id$") - TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_IIOP_PROFILE), lite_flag_ (flag), @@ -447,48 +446,30 @@ TAO_IIOP_Connector::init_tcp_properties (void) ACE_DECLARE_NEW_CORBA_ENV; - // Check ORB-level override for tcp properties. - TAO_ClientProtocolPolicy *client_protocols = - this->orb_core ()->policy_manager ()->client_protocol (); - CORBA::Object_var auto_release = client_protocols; - RTCORBA::TCPProtocolProperties_var tcp_properties = - RTCORBA::TCPProtocolProperties::_nil (); - - if (client_protocols != 0) + RTCORBA::ProtocolProperties_var properties = + RTCORBA::ProtocolProperties::_nil (); + + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); + + if (tph != 0) { - RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep (); - - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) - { - tcp_properties = - RTCORBA::TCPProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - } + const char protocol [] = "iiop"; + const char *protocol_type = protocol; - if (CORBA::is_nil (tcp_properties.in ())) - { - // No tcp properties in ORB-level override. Use ORB defaults. - // Orb defaults should never be null - they were initialized by - // the ORB_Core. - client_protocols = this->orb_core ()->default_client_protocol (); - auto_release = client_protocols; - RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep (); - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) - { - tcp_properties = - RTCORBA::TCPProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } + int hook_result = + tph->call_client_protocols_hook (this->orb_core (), + properties, + protocol_type); + + if(hook_result == -1) + return -1; } + + RTCORBA::TCPProtocolProperties_var tcp_properties = + RTCORBA::TCPProtocolProperties::_narrow (properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + // Extract and locally store properties of interest. this->tcp_properties_.send_buffer_size = diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 697b2020bcc..d0ee36a7c46 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -57,8 +57,6 @@ 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/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 \ @@ -215,8 +213,6 @@ CPPFLAGS += -I$(TAO_ROOT) .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/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 \ @@ -354,8 +350,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ - IORManipulation.h \ + $(TAO_ROOT)/tao/CDR.i IORC.i IORManipulation.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i @@ -364,8 +359,6 @@ 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 \ @@ -464,9 +457,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/LocalObject.i \ - IORManip_Loader.h ior_manip_export.h \ - $(TAO_ROOT)/tao/Object_Loader.h \ + $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \ + ior_manip_export.h $(TAO_ROOT)/tao/Object_Loader.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -626,6 +618,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 7f646f3c739..1e63f964454 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -55,8 +55,6 @@ 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/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 \ @@ -334,6 +332,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -346,8 +364,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -380,8 +396,6 @@ CPPFLAGS += -I$(TAO_ROOT) .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 \ @@ -658,6 +672,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -670,8 +704,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -698,13 +730,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 + $(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/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 \ @@ -824,9 +854,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 \ - IOR_Table_Impl.h IORTable.h IORTableC.h \ - $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IOR_Table_Impl.h \ + IORTable.h IORTableC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -983,6 +1012,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -995,8 +1044,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1026,9 +1073,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/pre.h IORTable.h iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1306,6 +1351,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1318,8 +1383,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 87366e6ad1a..5f2ed04a622 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -31,7 +31,6 @@ ACE_RCSID(tao, Invocation, "$Id$") - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Invocation_Timeprobe_Description[] = @@ -200,6 +199,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->orb_core_->endpoint_selector_factory ()->get_selector (this, ACE_TRY_ENV); ACE_CHECK; + this->is_selector_initialized_ = 1; } @@ -555,6 +555,7 @@ TAO_GIOP_Invocation::create_ior_info (void) // work if there was forwarding ... But it seems the problem isn't // just here, but the whole addressing mode thing won't work if // there was forwarding. + const TAO_MProfile &mprofile = this->stub_->base_profiles (); for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i) @@ -586,48 +587,13 @@ TAO_GIOP_Invocation::add_rt_service_context (CORBA_Environment &ACE_TRY_ENV) if (this->endpoint_selection_state_.priority_model_policy_) { - if (this->endpoint_selection_state_.priority_model_policy_-> - get_priority_model () == RTCORBA::CLIENT_PROPAGATED) - { - // Encapsulate the priority of the current thread into - // a service context. - TAO_OutputCDR cdr; - if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) - == 0) - || (cdr << this->endpoint_selection_state_.client_priority_) - == 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 (); - context_list.length (l + 1); - context_list[l].context_id = IOP::RTCorbaPriority; - - // Make a *copy* of the CDR stream... - CORBA::ULong length = cdr.total_length (); - context_list[l].context_data.length (length); - CORBA::Octet *buf = context_list[l].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->orb_core_->get_protocols_hooks + ()->add_rt_service_context_hook ( + this, + this->endpoint_selection_state_.priority_model_policy_, + this->endpoint_selection_state_.client_priority_, + ACE_TRY_ENV); + ACE_CHECK; } else { diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index c376a07d5ce..c8aacd3bffc 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -147,6 +147,12 @@ public: /// give up its ownership. User must deallocate memory. CORBA::PolicyList *get_inconsistent_policies (void); + /// Get the protected variable <endpoint_selection_state_> + TAO_Endpoint_Selection_State get_endpoint_selection_state (void); + + /// Get the pointer to stub. + TAO_Stub *get_stub (void); + /** * Add the given object reference to the list of forward profiles. * This basically emulates a LOCATION_FORWARD reply from the diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i index b4359574c51..8688d0aa33d 100644 --- a/TAO/tao/Invocation.i +++ b/TAO/tao/Invocation.i @@ -65,6 +65,18 @@ TAO_GIOP_Invocation::get_inconsistent_policies (void) return this->inconsistent_policies_._retn (); } +ACE_INLINE TAO_Endpoint_Selection_State +TAO_GIOP_Invocation::get_endpoint_selection_state (void) +{ + return this->endpoint_selection_state_; +} + +ACE_INLINE TAO_Stub * +TAO_GIOP_Invocation::get_stub (void) +{ + return this->stub_; +} + ACE_INLINE void TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 8244a62d550..0fa74b575e3 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -7,15 +7,15 @@ #endif /* __ACE_INLINE__ */ #include "tao/Invocation.h" -#include "tao/RT_Policy_i.h" #include "tao/Client_Priority_Policy.h" #include "tao/Stub.h" #include "tao/Profile.h" #include "tao/Endpoint.h" +#include "tao/RT_Invocation_Endpoint_Selectors.h" ACE_RCSID(tao, Invocation_Endpoint_Selectors, "$Id$") - +// **************************************************************** void TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation @@ -23,7 +23,6 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation CORBA::Environment &ACE_TRY_ENV) { #if (TAO_HAS_RT_CORBA == 1) - // Obtains correct selector if TAO::Client_Priority_Policy is // enabled. this->check_client_priority_policy (invocation, @@ -79,11 +78,20 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation return; } - if (state.priority_model_policy_->get_priority_model () - == RTCORBA::CLIENT_PROPAGATED) + CORBA::Boolean is_client_propagated = 0; + + // @@ This is to be used in case 3: + CORBA::Short server_priority = 0; + + invocation->orb_core_->get_protocols_hooks () ->get_selector_hook ( + state.priority_model_policy_, + is_client_propagated, + server_priority); + + if (is_client_propagated) { // Get client priority. - if (invocation->orb_core_->get_thread_priority (state.client_priority_) + if (invocation->orb_core_->get_thread_priority (state.client_priority_) == -1) ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); @@ -94,27 +102,20 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation { // Figure out target priority. CORBA::Short p; - if (state.priority_model_policy_->get_priority_model () - == RTCORBA::CLIENT_PROPAGATED) + if (is_client_propagated) p = state.client_priority_; else - p = state.priority_model_policy_->server_priority (); + p = server_priority; - // Find the band with the range covering our target priority. - RTCORBA::PriorityBands &bands = - state.bands_policy_->priority_bands_rep (); - int in_range = 0; - for (CORBA::ULong i = 0; i < bands.length (); ++i) - if (bands[i].low <= p && bands[i].high >= p) - { - state.min_priority_ = bands[i].low; - state.max_priority_ = bands[i].high; - - in_range = 1; - break; - } - + + invocation->orb_core_->get_protocols_hooks + ()->get_selector_bands_policy_hook (state.bands_policy_, + state.min_priority_, + state.max_priority_, + p, + in_range); + // If priority doesn't fall into any of the bands if (!in_range) { @@ -141,8 +142,7 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation } // CASE 4: CLIENT_PROPAGATED priority model, no bands. - if (state.priority_model_policy_->get_priority_model () - == RTCORBA::CLIENT_PROPAGATED) + if (is_client_propagated) { if (state.client_protocol_policy_ == 0) invocation->endpoint_selector_ = @@ -161,11 +161,10 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation invocation->endpoint_selector_ = invocation->orb_core_->protocol_endpoint_selector (); } - #else /* TAO_HAS_RT_CORBA == 1 */ - + ACE_UNUSED_ARG (ACE_TRY_ENV); - + invocation->endpoint_selector_ = invocation->orb_core_->default_endpoint_selector (); @@ -292,8 +291,6 @@ init_bands (TAO_GIOP_Invocation *invocation, ACE_CHECK; } -// **************************************************************** - TAO_Endpoint_Selection_State::~TAO_Endpoint_Selection_State (void) { CORBA::release (this->priority_model_policy_); @@ -382,580 +379,3 @@ TAO_Default_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation // FRED For now we will not deal with recursive forwards! invocation->stub_->reset_profiles (); } - -// **************************************************************** - -#if (TAO_HAS_RT_CORBA == 1) - -TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void) -{ -} - -void -TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - // Obtain profile. - invocation->profile_ = invocation->stub_->profile_in_use (); - - // Select an endpoint from the profile. - - if (invocation->profile_->endpoint_count () == 0) - { - // Unknown protocol - move onto the next profile. - this->next (invocation, ACE_TRY_ENV); - ACE_CHECK; - this->select_endpoint (invocation, ACE_TRY_ENV); - } - - else if (invocation->profile_->endpoint_count () == 1) - { - // Profile contains just one endpoint. This happens when: - // a) we are talking to a nonTAO server (which doesn't have - // the concept of multiple endpoints per profile) - // or - // b) we have TAO server with a non-lane threadpool, in which - // case there is only one acceptor - // In both cases we should use the endpoint regardless of its priority. - invocation->endpoint_ = invocation->profile_->endpoint (); - } - else - { - // Profiles contains more than one endpoint. Find one with the - // right priority. - TAO_Endpoint *endpoint = 0; - for (TAO_Endpoint *endp = invocation->profile_->endpoint (); - endp != 0; - endp = endp->next ()) - { - if (endp->priority () - == invocation->endpoint_selection_state_.client_priority_) - { - endpoint = endp; - break; - } - } - - if (endpoint != 0) - { - // Found an Endpoint with correct priority. - invocation->endpoint_ = endpoint; - } - else - { - // The profile didn't contain an endpoint with matching priority. - // There are two possibilities: - // a) the server is a multi-homed host and this is the - // only reason for profile containing more than 1 - // endpoint, i.e., case a) above. - // b) we have misconfiguration - threadpool with lanes on - // the server, and client priority not matching any of - // the lanes. - if (this->is_multihomed (invocation->profile_->endpoint ())) - { - // case a - invocation->endpoint_ = invocation->profile_->endpoint (); - } - else - // case b - { - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - CORBA::Policy::_duplicate (invocation-> - endpoint_selection_state_.priority_model_policy_); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - } - } -} - -int -TAO_Priority_Endpoint_Selector::is_multihomed (TAO_Endpoint *endpoint) -{ - for (TAO_Endpoint *endp = endpoint; - endp != 0; - endp = endp->next ()) - { - if (endp->next () != 0 - && endp->priority () != endp->next ()->priority ()) - return 0; - } - return 1; -} - -// **************************************************************** - -TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void) -{ -} - -void -TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - // Obtain profile. - invocation->profile_ = invocation->stub_->profile_in_use (); - - // Select an endpoint from the profile. - - if (invocation->profile_->endpoint_count () == 0) - { - // Unknown protocol - move onto the next profile. - this->next (invocation, ACE_TRY_ENV); - ACE_CHECK; - this->select_endpoint (invocation, ACE_TRY_ENV); - } - - else - { - // Find the endpoint for the band of interest. - TAO_Endpoint *endpoint = 0; - for (TAO_Endpoint *endp = invocation->profile_->endpoint (); - endp != 0; - endp = endp->next ()) - { - if (endp->priority () - <= invocation->endpoint_selection_state_.max_priority_ - && endp->priority () - >= invocation->endpoint_selection_state_.min_priority_) - { - endpoint = endp; - break; - } - } - - if (endpoint != 0) - { - // Found an Endpoint with priority in the range of the band. - invocation->endpoint_ = endpoint; - } - else - { - // The profile didn't contain an endpoint with priority - // matching the band. - // There are two possibilities: - // a) we are talking to non-TAO server. - // b) we have misconfiguration - bands were set on the - // client and do not match server configuration. - // In both cases throw exception. (We are throwing - // exception for case 'a' because the current implementation of - // bands is not interoperable.) - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - CORBA::Policy::_duplicate (invocation-> - endpoint_selection_state_.bands_policy_); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - } -} - -// **************************************************************** - -TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void) -{ -} - -void -TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - RTCORBA::ProtocolList & protocols = - invocation->endpoint_selection_state_. - client_protocol_policy_->protocols_rep (); - - CORBA::ULong protocol_index = - invocation->endpoint_selection_state_.client_protocol_index_; - - if (protocols.length () == protocol_index) - // We have tried all the protocols specified in the client - // protocol policy with no success. Throw exception. - { - // Figure out proper exception. - if (!invocation->endpoint_selection_state_.valid_endpoint_found_) - { - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - CORBA::Policy::_duplicate (invocation-> - endpoint_selection_state_.client_protocol_policy_); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - else - // At least one satisfactory endpoint was found, but - // connection could not be established. - ACE_THROW (CORBA::COMM_FAILURE ()); - } - - // Find a Profile for the next protocol we would like to try. - TAO_Profile *profile = 0; - TAO_MProfile& mprofile = invocation->stub_->base_profiles (); - - for (TAO_PHandle i = 0; - i < mprofile.profile_count (); - ++i) - { - TAO_Profile *pf = mprofile.get_profile (i); - if (pf->tag () - == protocols[protocol_index].protocol_type) - { - profile = pf; - break; - } - } - - if (profile == 0 - || profile->endpoint_count () == 0) - { - // If either no profile for the protocol of interest were found - // or profile was found but client ORB doesn't understand the - // protocol, try another protocol. - invocation->endpoint_selection_state_.client_protocol_index_++; - this->select_endpoint (invocation, ACE_TRY_ENV); - } - else - { - // Found the profile - get the endpoint. - invocation->profile_ = profile; - this->endpoint (invocation, ACE_TRY_ENV); - } -} - -void -TAO_Protocol_Endpoint_Selector::endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment& /*ACE_TRY_ENV*/) -{ - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_ = invocation->profile_->endpoint (); -} - -void -TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - ACE_UNUSED_ARG (ACE_TRY_ENV); - - invocation->endpoint_selection_state_.client_protocol_index_++; - // If we ran out of profiles to try - this will be detected and - // exception thrown once <endpoint> is called. -} - -void -TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation - *invocation, - const TAO_MProfile& /* mprofile */, - CORBA::Environment &ACE_TRY_ENV) -{ - // Location forwarding is currently not supported when using - // RTCORBA::ClientProtocolPolicy. With the current profile - // management scheme being broken, it would be a pain to support here. - // @@ Add support for location forwarding once profile management is - // redesigned. - - // Currently location forward replies are ignored. When we receive - // a location forward reply, we act as if the profile we used - // didn't work, and we try the next one. Should we throw not - // supported exception instead? - this->next (invocation, ACE_TRY_ENV); -} - -void -TAO_Protocol_Endpoint_Selector::success (TAO_GIOP_Invocation *invocation) -{ - invocation->stub_->set_valid_profile (); -} - -void -TAO_Protocol_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation) -{ - invocation->endpoint_selection_state_.client_protocol_index_ = 0; -} - -// **************************************************************** - -TAO_Client_Priority_Policy_Selector::~TAO_Client_Priority_Policy_Selector (void) -{ -} - -void -TAO_Client_Priority_Policy_Selector::select_endpoint (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - TAO_MProfile& mprofile = invocation->stub_->base_profiles (); - invocation->endpoint_ = 0; - CORBA::ULong profile_index = - invocation->endpoint_selection_state_.client_protocol_index_; - - if (mprofile.profile_count () == profile_index) - // We have tried all the profiles with no success. Throw exception. - { - // Figure out proper exception. - if (!invocation->endpoint_selection_state_.valid_endpoint_found_) - { - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - invocation->stub_->get_client_policy - (TAO_CLIENT_PRIORITY_POLICY_TYPE, - ACE_TRY_ENV); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - else - // At least one satisfactory endpoint was found, but - // connection could not be established. - ACE_THROW (CORBA::COMM_FAILURE ()); - } - - CORBA::Short max = - invocation->endpoint_selection_state_.max_priority_; - CORBA::Short min = - invocation->endpoint_selection_state_.min_priority_; - - for (TAO_PHandle i = profile_index; - i < mprofile.profile_count (); - ++i) - { - TAO_Profile *profile = mprofile.get_profile (i); - - // Check if this profile contains any endpoints of the - // right priority. - for (TAO_Endpoint *endp = profile->endpoint (); - endp != 0; - endp = endp->next ()) - { - CORBA::Short priority = endp->priority (); - if (priority >= min && priority <= max) - { - invocation->profile_ = profile; - invocation->endpoint_ = endp; - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_selection_state_.client_protocol_index_ = i; - break; - } - } - - if (invocation->endpoint_ != 0) - break; - } - - // We were not able to find profile with the endpoint of the - // right priority. - if (invocation->endpoint_ == 0) - // Figure out proper exception. - if (!invocation->endpoint_selection_state_.valid_endpoint_found_) - { - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - invocation->stub_->get_client_policy - (TAO_CLIENT_PRIORITY_POLICY_TYPE, - ACE_TRY_ENV); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - else - // At least one satisfactory endpoint was found, but - // connection could not be established. - ACE_THROW (CORBA::COMM_FAILURE ()); -} - -void -TAO_Client_Priority_Policy_Selector::next (TAO_GIOP_Invocation - *invocation, - CORBA::Environment &ACE_TRY_ENV) -{ - ACE_UNUSED_ARG (ACE_TRY_ENV); - - invocation->endpoint_selection_state_.client_protocol_index_++; - // If we ran out of profiles to try - this will be detected and - // exception thrown once <endpoint> is called. -} - -void -TAO_Client_Priority_Policy_Selector::forward (TAO_GIOP_Invocation - *invocation, - const TAO_MProfile & /* mprofile */, - CORBA::Environment &ACE_TRY_ENV) -{ - // Location forwarding is not supported when using - // TAO::Client_Priority_Policy. Location forward replies are - // ignored. When we receive a location forward reply, we act as if - // the profile we used didn't work, and we try the next one. - this->next (invocation, ACE_TRY_ENV); -} - -void -TAO_Client_Priority_Policy_Selector::success (TAO_GIOP_Invocation *invocation) -{ - invocation->stub_->set_valid_profile (); -} - -void -TAO_Client_Priority_Policy_Selector::close_connection (TAO_GIOP_Invocation *invocation) -{ - invocation->endpoint_selection_state_.client_protocol_index_ = 0; -} - -// **************************************************************** - -TAO_Priority_Protocol_Selector::~TAO_Priority_Protocol_Selector (void) -{ -} - -void -TAO_Priority_Protocol_Selector::endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment - &ACE_TRY_ENV) -{ - if (invocation->profile_->endpoint_count () == 1) - { - // Profile contains just one endpoint. This happens when: - // a) we are talking to a nonTAO server (which doesn't have - // the concept of multiple endpoints per profile) - // or - // b) we have TAO server with a non-lane threadpool, in which - // case there is only one acceptor - // In both cases we should use the endpoint regardless of its priority. - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_ = invocation->profile_->endpoint (); - } - else - { - // Profiles contains more than one endpoint. Find one with the - // right priority. - TAO_Endpoint *endpoint = 0; - for (TAO_Endpoint *endp = invocation->profile_->endpoint (); - endp != 0; - endp = endp->next ()) - { - if (endp->priority () - == invocation->endpoint_selection_state_.client_priority_) - { - endpoint = endp; - break; - } - } - - if (endpoint != 0) - { - // Found an Endpoint with correct priority. - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_ = endpoint; - } - else - { - // The profile didn't contain an endpoint with matching priority. - // There are two possibilities: - // a) the server is a multi-homed host and this is the - // only reason for profile containing more than 1 - // endpoint, i.e., case a) above. - // b) we have misconfiguration - threadpool with lanes on - // the server, and client priority not matching any of - // the lanes. - if (this->is_multihomed (invocation->profile_->endpoint ())) - { - // case a - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_ = invocation->profile_->endpoint (); - } - else - // case b - { - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - CORBA::Policy::_duplicate (invocation-> - endpoint_selection_state_.priority_model_policy_); - } - ACE_THROW (CORBA::INV_POLICY ()); - } - } - } -} - -int -TAO_Priority_Protocol_Selector::is_multihomed (TAO_Endpoint *endpoint) -{ - for (TAO_Endpoint *endp = endpoint; - endp != 0; - endp = endp->next ()) - { - if (endp->next () != 0 - && endp->priority () != endp->next ()->priority ()) - return 0; - } - return 1; -} - -// **************************************************************** - -TAO_Bands_Protocol_Selector::~TAO_Bands_Protocol_Selector (void) -{ -} - -void -TAO_Bands_Protocol_Selector::endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment - &ACE_TRY_ENV) -{ - // Find the endpoint for the band of interest. - TAO_Endpoint *endpoint = 0; - for (TAO_Endpoint *endp = invocation->profile_->endpoint (); - endp != 0; - endp = endp->next ()) - { - if (endp->priority () - <= invocation->endpoint_selection_state_.max_priority_ - && endp->priority () - >= invocation->endpoint_selection_state_.min_priority_) - { - endpoint = endp; - break; - } - } - - if (endpoint != 0) - { - // Found an Endpoint with priority in the range of the band. - invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; - invocation->endpoint_ = endpoint; - } - else - { - // The profile didn't contain an endpoint with priority - // matching the band. - // There are two possibilities: - // a) we are talking to non-TAO server. - // b) we have misconfiguration - bands were set on the - // client and do not match server configuration. - // In both cases throw exception. (We are throwing - // exception for case 'a' because the current implementation of - // bands is not interoperable.) - if (invocation->inconsistent_policies_.ptr ()) - { - invocation->inconsistent_policies_->length (1); - invocation->inconsistent_policies_[0u] = - CORBA::Policy::_duplicate (invocation-> - endpoint_selection_state_.bands_policy_); - } - ACE_THROW (CORBA::INV_POLICY ()); - } -} - -#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index b28930c4fb0..a615dfeb413 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -34,6 +34,8 @@ class TAO_PriorityModelPolicy; class TAO_ClientProtocolPolicy; class TAO_PriorityBandedConnectionPolicy; +// **************************************************************** + /** * @class TAO_Endpoint_Selector_Factory * @@ -91,9 +93,8 @@ private: CORBA::Environment &ACE_TRY_ENV); #endif /* TAO_HAS_RT_CORBA == 1 */ -}; -// **************************************************************** +}; #if (TAO_HAS_RT_CORBA == 1) @@ -125,12 +126,13 @@ public: // = State. + // RTCORBA policies that affect profile/endpoint selection. // Effective overrides of the RTCORBA policies that affect // profile/endpoint selection. - TAO_PriorityModelPolicy *priority_model_policy_; - TAO_ClientProtocolPolicy *client_protocol_policy_; - TAO_PrivateConnectionPolicy *private_connection_; - TAO_PriorityBandedConnectionPolicy *bands_policy_; + CORBA::Policy *priority_model_policy_; + CORBA::Policy *client_protocol_policy_; + CORBA::Policy *private_connection_; + CORBA::Policy *bands_policy_; /** * Index into the RTCORBA::ProtocolList of the @@ -257,194 +259,6 @@ public: virtual void close_connection (TAO_GIOP_Invocation *invocation); }; -// **************************************************************** - -#if (TAO_HAS_RT_CORBA == 1) - -class TAO_Export TAO_Priority_Endpoint_Selector : - public TAO_Default_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints based on the priority of the - // client thread making the invocation. - // - // = DESCRIPTION - // This strategy is used when RTCORBA::PriorityModelPolicy is - // set and its value is RTCORBA::CLIENT_PROPAGATED. - // -public: - /// Constructor. - TAO_Priority_Endpoint_Selector (void); - - /// Destructor. - virtual ~TAO_Priority_Endpoint_Selector (void); - - virtual void select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); -private: - /// Helper for <select_endpoint>. - int is_multihomed (TAO_Endpoint *endpoint); -}; - -// **************************************************************** - -class TAO_Export TAO_Bands_Endpoint_Selector : - public TAO_Default_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints based on the priority range. - // - // = DESCRIPTION - // This strategy is used when - // RTCORBA::PriorityBandedConnectionPolicy is set. - // -public: - /// Constructor. - TAO_Bands_Endpoint_Selector (void); - - /// Destructor. - virtual ~TAO_Bands_Endpoint_Selector (void); - - virtual void select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); -}; - -// **************************************************************** - -class TAO_Export TAO_Protocol_Endpoint_Selector : - public TAO_Invocation_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints based on protocols. - // - // = DESCRIPTION - // This strategy is used when only RTCORBA::ClientProtocolPolicy is - // set or RTCORBA::ClientProtocolPolicy plus - // RTCORBA::SERVER_DECLARED priority model. - // -public: - /// Constructor. - TAO_Protocol_Endpoint_Selector (void); - - /// Destructor. - virtual ~TAO_Protocol_Endpoint_Selector (void); - - virtual void select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void next (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void success (TAO_GIOP_Invocation *invocation); - virtual void close_connection (TAO_GIOP_Invocation *invocation); - -protected: - /// Helper for <select_endpoint>. - virtual void endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); -}; - -// **************************************************************** - -class TAO_Export TAO_Client_Priority_Policy_Selector : - public TAO_Invocation_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints when - // TAO::Client_Priority_Policy is set. - // - // = DESCRIPTION - // TAO::Client_Priority_Policy is deprecated. Similar (and - // beyond) functionality can be achieved through standard RTCORBA - // policies. See TAO Real-Time CORBA documentation for more - // information. - // -public: - /// Constructor. - TAO_Client_Priority_Policy_Selector (void); - - /// Destructor. - virtual ~TAO_Client_Priority_Policy_Selector (void); - - virtual void select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void next (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void success (TAO_GIOP_Invocation *invocation); - virtual void close_connection (TAO_GIOP_Invocation *invocation); -}; - -// **************************************************************** - -class TAO_Export TAO_Priority_Protocol_Selector : - public TAO_Protocol_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints based on protocols and the - // priority of the client thread making the invocation. - // - // = DESCRIPTION - // This strategy is used when RTCORBA::ClientProtocolPolicy is - // set and the priority model is RTCORBA::CLIENT_PROPAGATED. - // -public: - /// Constructor. - TAO_Priority_Protocol_Selector (void); - - /// Destructor. - virtual ~TAO_Priority_Protocol_Selector (void); - -protected: - /// - virtual void endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); - - /// Helper for <select_endpoint>. - int is_multihomed (TAO_Endpoint *endpoint); -}; - -// **************************************************************** - -class TAO_Export TAO_Bands_Protocol_Selector : - public TAO_Protocol_Endpoint_Selector -{ - // = TITLE - // Strategy for selecting endpoints based on protocols and a - // priority range. - // - // = DESCRIPTION - // This strategy is used when both RTCORBA::ClientProtocolPolicy - // and RTCORBA::PriorityBandedConnectionPolicy are set. - // -public: - /// Constructor. - TAO_Bands_Protocol_Selector (void); - - /// Destructor. - virtual ~TAO_Bands_Protocol_Selector (void); - -protected: - virtual void endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); -}; - -#endif /* TAO_HAS_RT_CORBA == 1 */ - #if defined (__ACE_INLINE__) # include "tao/Invocation_Endpoint_Selectors.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Invocation_Endpoint_Selectors.i b/TAO/tao/Invocation_Endpoint_Selectors.i index ce1ebde4ef1..f9d970df0ff 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.i +++ b/TAO/tao/Invocation_Endpoint_Selectors.i @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +// **************************************************************** + ACE_INLINE TAO_Endpoint_Selector_Factory::TAO_Endpoint_Selector_Factory (void) { @@ -12,7 +14,6 @@ TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) } // **************************************************************** -#if (TAO_HAS_RT_CORBA == 1) ACE_INLINE TAO_Endpoint_Selection_State::TAO_Endpoint_Selection_State (void) @@ -28,8 +29,6 @@ TAO_Endpoint_Selection_State::TAO_Endpoint_Selection_State (void) { } -#endif /* TAO_HAS_RT_CORBA == 1 */ - // **************************************************************** ACE_INLINE @@ -44,49 +43,3 @@ ACE_INLINE TAO_Default_Endpoint_Selector::TAO_Default_Endpoint_Selector (void) { } - -// **************************************************************** - -#if (TAO_HAS_RT_CORBA == 1) - -ACE_INLINE -TAO_Priority_Endpoint_Selector::TAO_Priority_Endpoint_Selector (void) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_Bands_Endpoint_Selector::TAO_Bands_Endpoint_Selector (void) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_Protocol_Endpoint_Selector::TAO_Protocol_Endpoint_Selector (void) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_Client_Priority_Policy_Selector::TAO_Client_Priority_Policy_Selector (void) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_Priority_Protocol_Selector::TAO_Priority_Protocol_Selector (void) -{ -} - -// **************************************************************** - -ACE_INLINE -TAO_Bands_Protocol_Selector::TAO_Bands_Protocol_Selector (void) -{ -} - -#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 540563603a5..a2740129d96 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -158,8 +158,11 @@ ORB_CORE_FILES = \ Client_Strategy_Factory \ debug \ Object_KeyC \ + Protocols_Hooks \ + Default_Protocols_Hooks \ Invocation \ Invocation_Endpoint_Selectors \ + RT_Invocation_Endpoint_Selectors \ Asynch_Invocation \ operation_details \ PortableInterceptor \ @@ -299,6 +302,7 @@ ORB_CORE_FILES += \ RT_Mutex \ RT_Policy_i \ RT_ORB \ + RT_Protocols_Hooks \ Pool_Per_Endpoint \ RTCORBAC \ RTCORBAS \ @@ -471,8 +475,6 @@ 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 \ @@ -729,6 +731,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Client_Strategy_Factory.h \ Wait_Strategy.h \ @@ -739,11 +761,8 @@ realclean: Object_KeyC.i \ target_specification.i -.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 \ +.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/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -836,8 +855,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - Tagged_Components.h IOPC.h \ + corbafwd.i Tagged_Components.h \ + IOPC.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -853,8 +872,8 @@ realclean: IOPC.i \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ - Tagged_Components.i \ - PolicyC.h CurrentC.h \ + Tagged_Components.i PolicyC.h \ + CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -870,12 +889,10 @@ realclean: Typecode.i \ Environment.h \ Environment.i \ - PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i Object_KeyC.h \ - Object_KeyC.i MessagingC.h \ - Remote_Object_Proxy_Impl.h \ + PolicyC.i GIOP_Message_State.h \ + GIOP_Message_State.i Profile.i \ + Object_KeyC.h Object_KeyC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -886,8 +903,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,16 +1018,33 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i debug.h -.obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \ - Endpoint.h \ +.obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp Endpoint.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 \ @@ -1112,8 +1146,6 @@ 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 \ @@ -1361,6 +1393,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Profile.h \ Tagged_Components.h \ @@ -1378,8 +1430,6 @@ 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 \ @@ -1636,6 +1686,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Server_Strategy_Factory.h \ debug.h \ @@ -1648,8 +1718,6 @@ 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 \ @@ -1905,10 +1973,6 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ - ORB_Core.i \ - MProfile.h \ - MProfile.i \ - debug.h \ RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ @@ -1928,6 +1992,11 @@ realclean: RTCORBAS_T.cpp \ RTCORBAS.i \ RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + MProfile.h \ + MProfile.i \ + debug.h \ Acceptor_Filter.h \ Acceptor_Filter.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -1939,8 +2008,6 @@ 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 \ @@ -2048,8 +2115,6 @@ 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 \ @@ -2149,8 +2214,6 @@ 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 \ @@ -2277,8 +2340,6 @@ 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 \ @@ -2567,6 +2628,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -2595,8 +2676,6 @@ 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 \ @@ -2885,6 +2964,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -2919,8 +3018,6 @@ 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 \ @@ -3184,6 +3281,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ debug.h \ iiop_endpoints.h \ @@ -3195,8 +3312,6 @@ 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 \ @@ -3484,6 +3599,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -3524,8 +3659,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -3564,8 +3697,6 @@ 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 \ @@ -3870,11 +4001,6 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ - ORB_Core.i \ - Client_Strategy_Factory.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ @@ -3894,6 +4020,12 @@ realclean: RTCORBAS_T.cpp \ RTCORBAS.i \ RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Client_Strategy_Factory.h \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Base_Connection_Property.h \ Base_Connection_Property.inl @@ -3903,8 +4035,6 @@ 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 \ @@ -4192,6 +4322,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -4219,25 +4369,6 @@ realclean: IIOP_Profile.i \ MProfile.h \ MProfile.i \ - RT_Policy_i.h \ - RTCORBAS.h \ - IOPS.h \ - IOPS_T.h \ - IOPS_T.i \ - IOPS_T.cpp \ - IOPS.i \ - TimeBaseS.h \ - TimeBaseS_T.h \ - TimeBaseS_T.i \ - TimeBaseS_T.cpp \ - TimeBaseS.i \ - RTCORBAC.h \ - RTCORBAC.i \ - RTCORBAS_T.h \ - RTCORBAS_T.i \ - RTCORBAS_T.cpp \ - RTCORBAS.i \ - RT_Policy_i.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -4249,8 +4380,6 @@ 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 \ @@ -4536,6 +4665,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ @@ -4551,8 +4700,6 @@ 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 \ @@ -4795,8 +4942,6 @@ realclean: .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 \ @@ -4927,8 +5072,6 @@ 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 \ @@ -5175,6 +5318,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Wait_On_Read.h \ Wait_Strategy.h \ @@ -5190,8 +5353,6 @@ 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 \ @@ -5440,6 +5601,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \ @@ -5450,8 +5631,6 @@ 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 \ @@ -5697,6 +5876,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ debug.h \ IIOP_Factory.h \ @@ -5709,8 +5908,6 @@ realclean: Reactor_Registry.i \ Single_Reactor.i \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ $(ACE_ROOT)/ace/TP_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ @@ -5745,8 +5942,6 @@ 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 \ @@ -5930,8 +6125,6 @@ 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 \ @@ -6106,13 +6299,10 @@ realclean: Protocol_Factory.h \ default_resource.i -.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \ - Marshal.h \ +.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.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 \ @@ -6250,13 +6440,10 @@ realclean: Marshal.i \ debug.h -.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \ - Marshal.h \ +.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.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 \ @@ -6397,8 +6584,6 @@ 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 \ @@ -6541,8 +6726,6 @@ 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 \ @@ -6676,8 +6859,6 @@ 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 \ @@ -6929,6 +7110,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ debug.h @@ -6937,8 +7138,6 @@ 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 \ @@ -7034,14 +7233,11 @@ realclean: corbafwd.i \ CORBA_String.inl -.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \ - CurrentC.h \ +.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h \ $(ACE_ROOT)/ace/pre.h \ 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 \ @@ -7148,11 +7344,8 @@ realclean: Sequence_T.i \ Sequence_T.cpp -.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \ - $(ACE_ROOT)/ace/streams.h \ +.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 \ @@ -7161,13 +7354,7 @@ realclean: $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - Exception.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/Dynamic_Service.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -7178,8 +7365,18 @@ realclean: $(ACE_ROOT)/ace/OS_TLI.h \ $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + Exception.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 \ @@ -7283,15 +7480,152 @@ realclean: CurrentC.i \ Encodable.h \ PolicyC.i \ - ORB.i + ORB.i \ + ORB_Core.h \ + Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ + 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 \ + 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_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 \ + PortableInterceptorC.h \ + DynamicC.h \ + 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 \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Dynamic_Adapter.h .obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp \ WrongTransactionC.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 \ @@ -7401,8 +7735,6 @@ 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 \ @@ -7649,15 +7981,32 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i -.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \ - Object.h \ +.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp Object.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 \ @@ -7915,6 +8264,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -7924,8 +8293,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -7955,8 +8322,6 @@ 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 \ @@ -8214,6 +8579,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ debug.h \ @@ -8226,8 +8611,6 @@ 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 \ @@ -8363,8 +8746,6 @@ realclean: .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 \ @@ -8529,8 +8910,7 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - ORB_Table.inl \ - Connector_Registry.h \ + ORB_Table.inl Connector_Registry.h \ Pluggable.h \ IOPC.h \ IOPC.i \ @@ -8564,9 +8944,8 @@ realclean: Pluggable.i \ params.h \ params.i \ - Connector_Registry.i \ - IOR_Parser.h IOR_Parser.i \ - Parser_Registry.h \ + Connector_Registry.i IOR_Parser.h \ + IOR_Parser.i Parser_Registry.h \ Parser_Registry.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ @@ -8595,9 +8974,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 \ - MProfile.h \ + $(ACE_ROOT)/ace/Arg_Shifter.h Object.h Typecode.h \ + Stub.h MProfile.h \ Profile.h \ Tagged_Components.h \ CONV_FRAMEC.h \ @@ -8656,11 +9034,7 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ - ORB_Core.i \ - Stub.i ORB_Core.h \ - Server_Strategy_Factory.h debug.h TAO_Internal.h TAO_Export.h \ - NVList.h NVList.i \ - Dynamic_Adapter.h CDR.h MProfile.h RT_ORB.h \ + RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ IOPS_T.h \ @@ -8678,6 +9052,13 @@ realclean: RTCORBAS_T.i \ RTCORBAS_T.cpp \ RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Stub.i ORB_Core.h \ + Server_Strategy_Factory.h debug.h TAO_Internal.h TAO_Export.h \ + NVList.h NVList.i \ + Dynamic_Adapter.h CDR.h MProfile.h RT_ORB.h \ RT_ORB.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ @@ -8690,15 +9071,12 @@ realclean: RT_ORBInitializer.h Messaging_ORBInitializer.h \ BiDir_ORBInitializer.h \ ValueFactory_Map.h \ - ValueFactory_Map.i \ - Object_KeyC.h Object_KeyC.i + ValueFactory_Map.i Object_KeyC.h \ + Object_KeyC.i -.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \ - corbafwd.h \ +.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 \ @@ -8793,15 +9171,12 @@ realclean: TAO_Export.h \ corbafwd.i -.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \ - PolicyC.h \ +.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \ $(ACE_ROOT)/ace/pre.h \ CurrentC.h \ 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 \ @@ -9057,6 +9432,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -9066,8 +9461,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -9088,8 +9481,6 @@ 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 \ @@ -9189,8 +9580,6 @@ 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 \ @@ -9290,8 +9679,6 @@ 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 \ @@ -9392,8 +9779,6 @@ 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 \ @@ -9496,8 +9881,6 @@ 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 \ @@ -9597,8 +9980,6 @@ 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 \ @@ -9856,6 +10237,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -9865,8 +10266,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -9882,11 +10281,8 @@ realclean: Invocation_Endpoint_Selectors.i \ Invocation.i -.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 \ +.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/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -10008,11 +10404,11 @@ realclean: Typecode.i \ Environment.h \ Environment.i \ - PolicyC.i \ - ClientRequestInfo.h PortableInterceptorC.h DynamicC.h \ + PolicyC.i ClientRequestInfo.h \ + PortableInterceptorC.h DynamicC.h \ Any.h \ - Any.i DynamicC.i \ - MessagingC.h Remote_Object_Proxy_Impl.h \ + Any.i DynamicC.i MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -10026,41 +10422,7 @@ realclean: 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 \ + StringSeqC.i Invocation.h CDR.h Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -10122,6 +10484,16 @@ 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 \ @@ -10130,6 +10502,7 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -10166,12 +10539,51 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ - Stub.i Exception.h \ - InterfaceC.h ifrfwd.h \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + target_specification.h Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.i \ + Invocation.i ClientRequestInfo.inl DomainC.i Exception.h InterfaceC.h \ + ifrfwd.h \ Remote_Object_Proxy_Impl.h \ ORB_Core.h PortableInterceptor.h \ - PortableInterceptor.i + PortableInterceptor.i \ + RequestInfo_Util.h .obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp \ TimeBaseC.h \ @@ -10180,8 +10592,6 @@ 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 \ @@ -10307,8 +10717,6 @@ 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 \ @@ -10430,8 +10838,6 @@ 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 \ @@ -10540,13 +10946,10 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i -.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \ - Sequence.h \ +.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp Sequence.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 \ @@ -10647,14 +11050,11 @@ realclean: Sequence_T.i \ Sequence_T.cpp -.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \ - MProfile.h \ +.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp MProfile.h \ $(ACE_ROOT)/ace/pre.h \ $(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 \ @@ -10849,12 +11249,9 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i -.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.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 \ @@ -11112,20 +11509,35 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i Sequence.h Object.h \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ + Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.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 \ + Priority_Mapping_Manager.i TAOC.i \ operation_details.h \ Service_Context.h \ Service_Context.inl \ @@ -11134,51 +11546,31 @@ realclean: Object_KeyC.i \ target_specification.i \ operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - Asynch_Invocation.h \ + Invocation.i Asynch_Invocation.h \ Invocation.h \ Asynch_Reply_Dispatcher.h \ Asynch_Reply_Dispatcher.i \ - Asynch_Invocation.i \ - ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \ + Asynch_Invocation.i ORB_Core.h \ + Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \ + TAOC.h \ Sync_Strategies.i \ Buffering_Constraint_Policy.h \ Buffering_Constraint_Policy.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ Client_Priority_Policy.h \ - Client_Priority_Policy.i \ - debug.h RT_Policy_i.h \ - RTCORBAS.h \ - IOPS.h \ - IOPS_T.h \ - IOPS_T.i \ - IOPS_T.cpp \ - IOPS.i \ - TimeBaseS.h \ - TimeBaseS_T.h \ - TimeBaseS_T.i \ - TimeBaseS_T.cpp \ - TimeBaseS.i \ - RTCORBAS_T.h \ - RTCORBAS_T.i \ - RTCORBAS_T.cpp \ - RTCORBAS.i \ - RT_Policy_i.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + Client_Priority_Policy.i debug.h \ + RT_Policy_i.h $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp \ - Typecode.h \ +.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp Typecode.h \ $(ACE_ROOT)/ace/pre.h \ $(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 \ @@ -11315,13 +11707,10 @@ realclean: Marshal.i \ debug.h -.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \ - CDR.h \ +.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp CDR.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 \ @@ -11568,6 +11957,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \ @@ -11575,8 +11984,6 @@ 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 \ @@ -11677,8 +12084,6 @@ 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 \ @@ -11851,8 +12256,6 @@ realclean: .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 \ @@ -12103,6 +12506,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \ @@ -12112,8 +12535,6 @@ 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 \ @@ -12157,8 +12578,6 @@ 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 \ @@ -12258,8 +12677,6 @@ 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 \ @@ -12368,14 +12785,9 @@ realclean: Exception.i \ Typecode.i -.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \ - Invocation.h \ - $(ACE_ROOT)/ace/pre.h \ - CDR.h \ - corbafwd.h \ +.obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \ + $(ACE_ROOT)/ace/pre.h 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 \ @@ -12468,28 +12880,272 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Any.h \ - Environment.h \ - Environment.i \ + corbafwd.i ORB.h \ + corbafwd.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ + CurrentC.i \ + Encodable.h \ + 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 \ + ORB.i Environment.h \ + Policy_Manager.h LocalObject.h \ + LocalObject.i \ + 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 \ + 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_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 \ + TAO_Singleton.h \ + TAO_Singleton_Manager.h 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 \ + 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 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 RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i ORB_Core.i \ + RTCORBAC.h $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp + +.obj/Default_Protocols_Hooks.o .obj/Default_Protocols_Hooks.so .shobj/Default_Protocols_Hooks.o .shobj/Default_Protocols_Hooks.so: Default_Protocols_Hooks.cpp \ + Default_Protocols_Hooks.h $(ACE_ROOT)/ace/pre.h \ + Protocols_Hooks.h ORB_Core.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.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 ORB.h \ + corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Typecode.i \ - Any.i \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - IOPC.h \ + Services.h \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -12497,52 +13153,274 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - Reply_Dispatcher.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - TAOC.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ PolicyC.h \ CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ CurrentC.i \ Encodable.h \ + 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 \ + ORB.i Environment.h \ + Policy_Manager.h LocalObject.h \ + LocalObject.i \ + 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 \ + 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_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 \ + TAO_Singleton.h \ + TAO_Singleton_Manager.h 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 \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ + PollableC.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 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 RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ RTCORBAC.h \ RTCORBAC.i \ - Priority_Mapping.i \ - LocalObject.h \ - LocalObject.i \ - 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 \ - Principal.h \ - OctetSeqC.h \ - OctetSeqC.i \ - Principal.i \ - Stub.h \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i ORB_Core.i \ + RTCORBAC.h \ + Default_Protocols_Hooks.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp + +.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp Invocation.h \ + $(ACE_ROOT)/ace/pre.h CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.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 \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i Stub.h \ Pluggable.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + IOPC.h \ + CDR.h \ + IOPC.i \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -12603,6 +13481,28 @@ 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 \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + Environment.h \ + Environment.i \ + PolicyC.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ ORB.h \ Services.h \ Services.i \ @@ -12611,6 +13511,8 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -12626,6 +13528,8 @@ realclean: PolicyFactory_Registry.h \ PortableInterceptorC.h \ DynamicC.h \ + Any.h \ + Any.i \ DynamicC.i \ MessagingC.h \ Remote_Object_Proxy_Impl.h \ @@ -12633,6 +13537,8 @@ realclean: ValueBase.i \ ValueFactory.h \ ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -12659,18 +13565,6 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ - ORB_Core.i \ - Stub.i \ - Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ - Dynamic_Adapter.h \ - debug.h \ - Connector_Registry.h \ - Connector_Registry.i \ - Wait_Strategy.h \ - Transport_Mux_Strategy.h \ - Bind_Dispatcher_Guard.h \ - Bind_Dispatcher_Guard.i \ RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ @@ -12683,19 +13577,48 @@ realclean: TimeBaseS_T.i \ TimeBaseS_T.cpp \ TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ RTCORBAS_T.h \ RTCORBAS_T.i \ RTCORBAS_T.cpp \ RTCORBAS.i \ RT_Policy_i.i \ - Base_Connection_Property.h \ + Protocols_Hooks.h \ + ORB_Core.i \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + target_specification.h Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.i \ + Invocation.i Principal.h corbafwd.h OctetSeqC.h OctetSeqC.i \ + Principal.i Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h Dynamic_Adapter.h \ + Object_KeyC.h debug.h Pluggable.h Connector_Registry.h \ + Connector_Registry.i \ + Wait_Strategy.h Transport_Mux_Strategy.h Bind_Dispatcher_Guard.h \ + Bind_Dispatcher_Guard.i \ + Transport_Mux_Strategy.h \ + Endpoint.h RT_Policy_i.h Base_Connection_Property.h \ Base_Connection_Property.inl \ Private_Connection_Descriptor.h \ Private_Connection_Descriptor.inl \ Messaging_Policy_i.h \ - Messaging_Policy_i.i \ - GIOP_Utils.h \ - GIOP_Utils.i \ + Messaging_Policy_i.i GIOP_Utils.h \ + GIOP_Utils.i ORB_Core.h \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ @@ -12708,8 +13631,6 @@ 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 \ @@ -12846,32 +13767,130 @@ realclean: MProfile.i \ Invocation_Endpoint_Selectors.i \ Invocation.h \ + 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 \ + LocalObject.h \ + LocalObject.i \ + 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 \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ + DynamicC.i \ + MessagingC.h \ + Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ TimeBaseC.h \ TimeBaseC.i \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - LocalObject.h \ - LocalObject.i \ - 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.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 \ RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ @@ -12884,13 +13903,183 @@ realclean: TimeBaseS_T.i \ TimeBaseS_T.cpp \ TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ RTCORBAS_T.h \ RTCORBAS_T.i \ RTCORBAS_T.cpp \ RTCORBAS.i \ RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Stub.i \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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.i \ Client_Priority_Policy.h \ Client_Priority_Policy.i \ + RT_Invocation_Endpoint_Selectors.h \ + RT_Invocation_Endpoint_Selectors.i + +.obj/RT_Invocation_Endpoint_Selectors.o .obj/RT_Invocation_Endpoint_Selectors.so .shobj/RT_Invocation_Endpoint_Selectors.o .shobj/RT_Invocation_Endpoint_Selectors.so: \ + RT_Invocation_Endpoint_Selectors.cpp \ + RT_Invocation_Endpoint_Selectors.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.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 \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + IOPC.h \ + CDR.h \ + $(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 \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + 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 \ + Typecode.h \ + Typecode.i \ + Environment.h \ + Environment.i \ + PolicyC.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ + Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.i \ + RT_Invocation_Endpoint_Selectors.i \ + Invocation.h \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -12961,6 +14150,8 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -12976,6 +14167,8 @@ realclean: PolicyFactory_Registry.h \ PortableInterceptorC.h \ DynamicC.h \ + Any.h \ + Any.i \ DynamicC.i \ MessagingC.h \ Remote_Object_Proxy_Impl.h \ @@ -12983,6 +14176,8 @@ realclean: ValueBase.i \ ValueFactory.h \ ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -13009,8 +14204,48 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ - Stub.i + Stub.i \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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.i \ + Client_Priority_Policy.h \ + Client_Priority_Policy.i .obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \ Asynch_Invocation.h \ @@ -13019,8 +14254,6 @@ 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 \ @@ -13117,24 +14350,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ - Any.h \ - 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 \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - IOPC.h \ + Stub.h \ + Pluggable.h \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -13142,62 +14359,14 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + IOPC.h \ IOPC.i \ - Reply_Dispatcher.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - TAOC.h \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - PolicyC.i \ - TimeBaseC.h \ - TimeBaseC.i \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - LocalObject.h \ - LocalObject.i \ - 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 \ - Asynch_Reply_Dispatcher.h \ - MessagingC.h \ - Remote_Object_Proxy_Impl.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - Asynch_Reply_Dispatcher.i \ - Asynch_Invocation.i \ - Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ - Stub.h \ - Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -13258,6 +14427,28 @@ 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 \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + Environment.h \ + Environment.i \ + PolicyC.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ ORB.h \ Services.h \ Services.i \ @@ -13266,6 +14457,8 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -13281,7 +14474,20 @@ realclean: 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 \ @@ -13305,8 +14511,53 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ + Asynch_Reply_Dispatcher.h \ + Asynch_Reply_Dispatcher.i \ + Asynch_Invocation.i \ + Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h \ Transport_Mux_Strategy.h .obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \ @@ -13314,8 +14565,6 @@ 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 \ @@ -13434,8 +14683,6 @@ 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 \ @@ -13585,8 +14832,6 @@ 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 \ @@ -13679,8 +14924,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PortableInterceptorC.h \ + corbafwd.i PortableInterceptorC.h \ corbafwd.h DynamicC.h \ Any.h \ CDR.h \ @@ -13726,41 +14970,7 @@ realclean: 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 \ + StringSeqC.i Invocation.h CDR.h Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -13822,6 +15032,16 @@ 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 \ @@ -13830,6 +15050,7 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -13866,15 +15087,51 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ - Stub.i Tagged_Components.h + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + target_specification.h Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.i \ + Invocation.i ClientRequestInfo.inl Tagged_Components.h .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \ 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 \ @@ -14018,8 +15275,6 @@ 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 \ @@ -14146,8 +15401,6 @@ 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 \ @@ -14272,8 +15525,6 @@ 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 \ @@ -14397,8 +15648,6 @@ 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 \ @@ -14527,12 +15776,10 @@ realclean: Environment.i \ PolicyC.i \ ORB.i Environment.h \ - Policy_Manager.h \ - LocalObject.h \ + Policy_Manager.h LocalObject.h \ LocalObject.i \ Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ + 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 \ @@ -14596,18 +15843,16 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h params.h \ - params.i \ - TAO_Singleton_Manager.h \ + params.i TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ + TAO_Singleton.h TAO_Singleton.inl \ TAO_Singleton.cpp \ TAO_Singleton.h \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h Any.h \ - Any.i DynamicC.i \ - MessagingC.h Remote_Object_Proxy_Impl.h \ + TAO_Singleton_Manager.h 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 \ @@ -14619,8 +15864,7 @@ realclean: 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 \ - Parser_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ Service_Callbacks.i \ @@ -14635,12 +15879,30 @@ realclean: 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 ORB_Table.h \ - ORB_Table.inl \ - TAO_Internal.h TAO_Export.h default_client.h \ + Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i Protocols_Hooks.h \ + RTCORBAC.h ORB_Core.i ORB_Table.h \ + ORB_Table.inl TAO_Internal.h \ + TAO_Export.h default_client.h \ Client_Strategy_Factory.h \ - default_client.i \ - default_server.h \ + default_client.i default_server.h \ Server_Strategy_Factory.h \ default_server.i \ default_resource.h \ @@ -14662,40 +15924,21 @@ realclean: Reactor_Registry.i \ Leader_Follower.h \ Leader_Follower.i \ - Connector_Registry.h \ - params.h \ + Connector_Registry.h params.h \ Connector_Registry.i \ Acceptor_Registry.h \ - Acceptor_Registry.i \ - RT_ORB.h RTCORBAS.h \ - IOPS.h \ - IOPS_T.h \ - IOPS_T.i \ - IOPS_T.cpp \ - IOPS.i \ - TimeBaseS.h \ - TimeBaseS_T.h \ - TimeBaseS_T.i \ - TimeBaseS_T.cpp \ - TimeBaseS.i \ - RTCORBAC.h \ - RTCORBAC.i \ - RTCORBAS_T.h \ - RTCORBAS_T.i \ - RTCORBAS_T.cpp \ - RTCORBAS.i \ + Acceptor_Registry.i RT_ORB.h \ RT_ORB.i \ Priority_Mapping_Manager.h \ 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 \ Priority_Mapping_Manager.h \ TAOC.i \ - Sync_Strategies.i \ - Object_Loader.h Object_Loader.i ObjectIDList.h \ + Sync_Strategies.i Object_Loader.h \ + Object_Loader.i ObjectIDList.h \ ObjectIDList.i \ $(ACE_ROOT)/ace/Env_Value_T.h \ $(ACE_ROOT)/ace/Env_Value_T.i \ @@ -14704,11 +15947,10 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(ACE_ROOT)/ace/Arg_Shifter.h \ - Services_Activate.h Invocation.h \ - Synch_Reply_Dispatcher.h \ + $(ACE_ROOT)/ace/Arg_Shifter.h Services_Activate.h \ + Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ - Reply_Dispatcher.i \ + Reply_Dispatcher.i TAOC.h \ operation_details.h \ Service_Context.h \ Service_Context.inl \ @@ -14717,16 +15959,16 @@ realclean: Object_KeyC.i \ target_specification.i \ operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - Invocation_Endpoint_Selectors.h IORInfo.h LocalObject.h + Invocation.i RT_Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.h \ + RT_Invocation_Endpoint_Selectors.i \ + IORInfo.h LocalObject.h .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 \ @@ -14893,12 +16135,10 @@ realclean: Environment.i \ PolicyC.i \ ORB.i Environment.h \ - Policy_Manager.h \ - LocalObject.h \ + Policy_Manager.h LocalObject.h \ LocalObject.i \ Policy_Manager.i \ - Resource_Factory.h \ - Pluggable.h \ + Resource_Factory.h Pluggable.h \ IOPC.h \ IOPC.i \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -14930,12 +16170,12 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.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 \ + params.i TAO_Singleton_Manager.h \ + TAO_Singleton.h Adapter.h Adapter.i PolicyFactory_Registry.h \ + PortableInterceptorC.h DynamicC.h \ Any.h \ - Any.i DynamicC.i \ - MessagingC.h Remote_Object_Proxy_Impl.h \ + Any.i DynamicC.i MessagingC.h \ + Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -14947,8 +16187,7 @@ realclean: 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 \ - Parser_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ Service_Callbacks.i \ @@ -14963,7 +16202,26 @@ realclean: 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 + Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i Protocols_Hooks.h \ + RTCORBAC.h ORB_Core.i .obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \ Leader_Follower.h \ @@ -14971,8 +16229,6 @@ 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 \ @@ -15219,6 +16475,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.i @@ -15227,8 +16503,6 @@ 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 \ @@ -15324,13 +16598,10 @@ realclean: corbafwd.i \ Reactor_Registry.i -.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \ - params.h \ +.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp params.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 \ @@ -15434,8 +16705,6 @@ 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 \ @@ -15690,6 +16959,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Client_Strategy_Factory.h @@ -15698,8 +16987,6 @@ 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 \ @@ -15803,8 +17090,6 @@ 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 \ @@ -16074,6 +17359,24 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i @@ -16084,8 +17387,6 @@ 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 \ @@ -16211,8 +17512,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - default_server.i \ - default_client.h \ + default_server.i default_client.h \ Client_Strategy_Factory.h \ default_client.i \ default_resource.h \ @@ -16268,12 +17568,10 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h \ - default_resource.i \ - IIOP_Factory.h CORBANAME_Parser.h \ - IOR_Parser.h \ - IOR_Parser.i \ - CORBANAME_Parser.i CORBALOC_Parser.h \ - ORB.h \ + default_resource.i IIOP_Factory.h \ + CORBANAME_Parser.h IOR_Parser.h \ + IOR_Parser.i CORBANAME_Parser.i \ + CORBALOC_Parser.h ORB.h \ Services.h \ Services.i \ CORBA_String.h \ @@ -16300,17 +17598,15 @@ realclean: GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ - MProfile.i \ - CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h \ - DLL_Parser.i Object_Loader.h Object_Loader.i + MProfile.i CORBALOC_Parser.i \ + FILE_Parser.h FILE_Parser.i DLL_Parser.h DLL_Parser.i Object_Loader.h \ + Object_Loader.i .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp \ TAO_Server_Request.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 \ @@ -16571,6 +17867,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -16588,8 +17904,6 @@ 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 \ @@ -16744,16 +18058,143 @@ realclean: StringSeqC.h \ StringSeqC.i \ Invocation.h \ + 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 \ + 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_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 \ + $(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 \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Stub.i \ 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 \ @@ -16764,14 +18205,6 @@ realclean: 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 \ @@ -16788,8 +18221,6 @@ 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 \ @@ -17039,6 +18470,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i @@ -17048,8 +18499,6 @@ 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 \ @@ -17150,8 +18599,6 @@ 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 \ @@ -17332,8 +18779,6 @@ 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 \ @@ -17581,6 +19026,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \ @@ -17589,8 +19054,6 @@ 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 \ @@ -17838,6 +19301,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -17848,8 +19331,6 @@ 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 \ @@ -17965,8 +19446,6 @@ 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 \ @@ -18152,8 +19631,6 @@ 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 \ @@ -18340,8 +19817,6 @@ 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 \ @@ -18456,8 +19931,6 @@ 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 \ @@ -18708,6 +20181,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Wait_Strategy.h \ Pluggable_Messaging_Utils.h \ @@ -18718,8 +20211,6 @@ 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 \ @@ -18972,6 +20463,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -18979,8 +20490,6 @@ realclean: .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 \ @@ -19102,10 +20611,8 @@ 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 \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.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/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -19210,15 +20717,13 @@ 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 \ @@ -19476,6 +20981,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -19485,8 +21010,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -19506,8 +21029,6 @@ 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 \ @@ -19613,8 +21134,8 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i PollableC.i \ - PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i + CDR.i PollableC.i PollableS_T.h \ + PollableS_T.i PollableS_T.cpp PollableS.i .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \ CONV_FRAMEC.h \ @@ -19622,8 +21143,6 @@ 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 \ @@ -19751,8 +21270,6 @@ 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 \ @@ -19867,8 +21384,6 @@ 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 \ @@ -20123,6 +21638,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/Service_Context.o .obj/Service_Context.so .shobj/Service_Context.o .shobj/Service_Context.so: Service_Context.cpp \ @@ -20130,8 +21665,6 @@ 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 \ @@ -20244,8 +21777,6 @@ 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 \ @@ -20375,8 +21906,6 @@ 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 \ @@ -20489,13 +22018,10 @@ realclean: GIOPS_T.i \ GIOPS_T.cpp GIOPS.i -.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \ - BoundsC.h \ +.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 \ @@ -20613,8 +22139,6 @@ realclean: .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 \ @@ -20750,19 +22274,16 @@ realclean: Priority_Mapping.i \ LocalObject.h \ LocalObject.i \ - Priority_Mapping_Manager.i \ - TAOC.i TAOS.h \ + Priority_Mapping_Manager.i TAOC.i \ + TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ TAOS.i -.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h \ - corbafwd.h \ +.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h 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 \ @@ -20855,15 +22376,13 @@ 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 \ @@ -20960,8 +22479,7 @@ realclean: $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - Object_Loader.i \ + $(ACE_ROOT)/ace/Service_Object.i Object_Loader.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -20971,8 +22489,6 @@ 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 \ @@ -21084,8 +22600,6 @@ realclean: $(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 \ @@ -21293,13 +22807,10 @@ realclean: TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl -.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp \ - Adapter.h \ +.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp Adapter.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 \ @@ -21548,6 +23059,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ @@ -21559,8 +23090,6 @@ 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 \ @@ -21668,8 +23197,6 @@ 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 \ @@ -21801,8 +23328,6 @@ 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 \ @@ -22051,6 +23576,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ default_resource.h \ default_resource.i \ @@ -22064,8 +23609,6 @@ 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 \ @@ -22178,8 +23721,6 @@ 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 \ @@ -22315,8 +23856,6 @@ 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 \ @@ -22475,8 +24014,6 @@ 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 \ @@ -22636,14 +24173,12 @@ 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 \ - CORBALOC_Parser.i ORB_Core.h corbafwd.h ORB.h Environment.h \ - Policy_Manager.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h CORBALOC_Parser.i \ + ORB_Core.h corbafwd.h ORB.h Environment.h Policy_Manager.h \ LocalObject.h \ LocalObject.i \ Policy_Manager.i \ - Resource_Factory.h \ - Pluggable.h \ + Resource_Factory.h Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -22686,18 +24221,16 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h params.h \ - params.i \ - TAO_Singleton_Manager.h \ + params.i TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ + TAO_Singleton.h TAO_Singleton.inl \ TAO_Singleton.cpp \ TAO_Singleton.h \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h Any.h \ - Any.i DynamicC.i \ - MessagingC.h Remote_Object_Proxy_Impl.h \ + TAO_Singleton_Manager.h 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 \ @@ -22709,8 +24242,7 @@ realclean: 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 \ - Parser_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ Service_Callbacks.i \ @@ -22725,7 +24257,26 @@ realclean: 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.h \ + Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i Protocols_Hooks.h \ + RTCORBAC.h ORB_Core.i Stub.h \ ORB_Core.h \ Stub.i Connector_Registry.h \ params.h \ @@ -22736,8 +24287,6 @@ 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 \ @@ -22854,26 +24403,11 @@ 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 \ - CORBANAME_Parser.i Invocation.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h CORBANAME_Parser.i \ + Invocation.h CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Any.h \ - Environment.h \ - Environment.i \ - Object.h \ - Abstract_Servant_Base.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - Typecode.h \ - Typecode.i \ - Any.i \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - IOPC.h \ + CDR.i Stub.h \ + Pluggable.h \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -22881,47 +24415,11 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + CDR.h \ IOPC.i \ - Reply_Dispatcher.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - TAOC.h \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - PolicyC.i \ - TimeBaseC.h \ - TimeBaseC.i \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - LocalObject.h \ - LocalObject.i \ - 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 Stub.h \ - Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -22963,6 +24461,28 @@ 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 \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + Environment.h \ + Environment.i \ + PolicyC.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ ORB.h \ Services.h \ Services.i \ @@ -22971,6 +24491,8 @@ realclean: ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -22986,6 +24508,8 @@ realclean: PolicyFactory_Registry.h \ PortableInterceptorC.h \ DynamicC.h \ + Any.h \ + Any.i \ DynamicC.i \ MessagingC.h \ Remote_Object_Proxy_Impl.h \ @@ -22993,6 +24517,8 @@ realclean: ValueBase.i \ ValueFactory.h \ ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -23019,16 +24545,52 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ - Stub.i + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + target_specification.h Invocation_Endpoint_Selectors.h \ + Invocation_Endpoint_Selectors.i \ + Invocation.i .obj/Bind_Dispatcher_Guard.o .obj/Bind_Dispatcher_Guard.so .shobj/Bind_Dispatcher_Guard.o .shobj/Bind_Dispatcher_Guard.so: Bind_Dispatcher_Guard.cpp \ Bind_Dispatcher_Guard.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 \ @@ -23146,8 +24708,6 @@ 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 \ @@ -23398,6 +24958,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Client_Strategy_Factory.h @@ -23406,8 +24986,6 @@ 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 \ @@ -23556,8 +25134,6 @@ 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 \ @@ -23650,8 +25226,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PortableInterceptorC.h \ + corbafwd.i PortableInterceptorC.h \ corbafwd.h DynamicC.h \ Any.h \ CDR.h \ @@ -23703,11 +25278,9 @@ realclean: CORBA_String.h \ CORBA_String.inl \ ORB.i Environment.h \ - Policy_Manager.h \ - LocalObject.h \ + Policy_Manager.h LocalObject.h \ Policy_Manager.i \ - Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ + 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 \ @@ -23769,19 +25342,16 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h params.h \ - params.i \ - TAO_Singleton_Manager.h \ + params.i TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ + TAO_Singleton.h TAO_Singleton.inl \ TAO_Singleton.cpp \ TAO_Singleton.h \ - TAO_Singleton_Manager.h \ - Adapter.h Adapter.i PolicyFactory_Registry.h PolicyC.h \ + TAO_Singleton_Manager.h Adapter.h \ + Adapter.i PolicyFactory_Registry.h PolicyC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - Parser_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ Service_Callbacks.i \ @@ -23796,12 +25366,29 @@ realclean: 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 + Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i Protocols_Hooks.h \ + RTCORBAC.h 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 \ - $(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 \ @@ -23809,8 +25396,7 @@ realclean: $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - PortableInterceptorC.h \ + $(ACE_ROOT)/ace/OS_Errno.inl PortableInterceptorC.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -23951,19 +25537,16 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ - ORBInitializer_Registry.inl \ - ORB.h Services.h \ + ORBInitializer_Registry.inl ORB.h \ + Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ - ORB.i \ - TAO_Singleton_Manager.h + ORB.i 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 \ - $(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 \ @@ -24056,8 +25639,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PortableInterceptorC.h \ + corbafwd.i PortableInterceptorC.h \ corbafwd.h DynamicC.h \ Any.h \ CDR.h \ @@ -24132,8 +25714,6 @@ 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 \ @@ -24238,8 +25818,6 @@ 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 \ @@ -24342,8 +25920,6 @@ 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 \ @@ -24602,13 +26178,31 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ 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 \ - $(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 \ @@ -24710,8 +26304,6 @@ 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 \ @@ -24808,11 +26400,8 @@ realclean: Endpoint.i \ Connection_Descriptor_Interface.inl -.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 \ +.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/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -24905,8 +26494,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PortableInterceptorC.h \ + corbafwd.i PortableInterceptorC.h \ corbafwd.h DynamicC.h \ Any.h \ CDR.h \ @@ -24951,8 +26539,8 @@ realclean: PollableC.h \ PollableC.i MessagingC.i \ CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \ - LocalObject.i PolicyC.h \ - MProfile.h Profile.h \ + LocalObject.i PolicyC.h MProfile.h \ + Profile.h \ Tagged_Components.h \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ @@ -24965,8 +26553,6 @@ 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 \ @@ -25095,15 +26681,12 @@ realclean: Object_Proxy_Impl.h \ Object.i Exception.h \ Exception.i Environment.h \ - Environment.i \ - CORBA_String.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 \ @@ -25233,8 +26816,6 @@ 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 \ @@ -25485,6 +27066,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.so .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.so: BiDir_PolicyFactory.cpp \ @@ -25492,8 +27093,6 @@ 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 \ @@ -25647,8 +27246,6 @@ 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 \ @@ -25910,18 +27507,35 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ debug.h -.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ - Services.h \ +.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp Services.h \ $(ACE_ROOT)/ace/pre.h \ 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 \ @@ -26042,13 +27656,10 @@ realclean: Typecode.i \ Any.i -.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \ - NVList.h \ +.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp NVList.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 \ @@ -26198,8 +27809,6 @@ 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 \ @@ -26297,157 +27906,6 @@ realclean: $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - ORB_Core.h \ - ORB.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Services.h \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - PolicyC.h \ - CurrentC.h \ - Object.h \ - Abstract_Servant_Base.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - CurrentC.i \ - Encodable.h \ - 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 \ - ORB.i \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.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_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 \ - 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 \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -26457,8 +27915,6 @@ 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 \ @@ -26715,6 +28171,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -26724,8 +28200,6 @@ realclean: TAOC.h \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ TAOC.i \ @@ -26746,8 +28220,6 @@ 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 \ @@ -26994,21 +28466,6 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ - ORB_Core.i \ - Buffering_Constraint_Policy.h \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - Buffering_Constraint_Policy.i \ - Messaging_Policy_i.h \ - Messaging_Policy_i.i \ - Client_Priority_Policy.h \ - Client_Priority_Policy.i \ RT_Policy_i.h \ RTCORBAS.h \ IOPS.h \ @@ -27021,19 +28478,33 @@ realclean: TimeBaseS_T.i \ TimeBaseS_T.cpp \ TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ RTCORBAS_T.h \ RTCORBAS_T.i \ RTCORBAS_T.cpp \ RTCORBAS.i \ - RT_Policy_i.i + RT_Policy_i.i \ + Protocols_Hooks.h \ + ORB_Core.i \ + Buffering_Constraint_Policy.h \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + Buffering_Constraint_Policy.i \ + Messaging_Policy_i.h \ + Messaging_Policy_i.i \ + Client_Priority_Policy.h \ + Client_Priority_Policy.i .obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp \ Messaging_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 \ @@ -27293,6 +28764,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ debug.h @@ -27302,8 +28793,6 @@ 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 \ @@ -27333,8 +28822,6 @@ 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 \ @@ -27480,8 +28967,6 @@ 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 \ @@ -27645,8 +29130,6 @@ 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 \ @@ -27897,14 +29380,32 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp \ 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 \ @@ -28043,8 +29544,6 @@ 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 \ @@ -28186,8 +29685,6 @@ 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 \ @@ -28464,18 +29961,18 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Stub.i \ Priority_Mapping.h \ Priority_Mapping.i -.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp \ - RT_Mutex.h \ +.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp RT_Mutex.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 \ @@ -28630,8 +30127,6 @@ 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 \ @@ -28779,15 +30274,131 @@ realclean: RTCORBAS.i \ LocalObject.h \ LocalObject.i \ - RT_Policy_i.i + RT_Policy_i.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 \ + 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 \ + Protocols_Hooks.h \ + ORB_Core.i -.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp \ - RT_ORB.h \ +.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.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 \ @@ -28941,13 +30552,305 @@ realclean: RT_Mutex.h \ RT_Mutex.i +.obj/RT_Protocols_Hooks.o .obj/RT_Protocols_Hooks.so .shobj/RT_Protocols_Hooks.o .shobj/RT_Protocols_Hooks.so: RT_Protocols_Hooks.cpp RT_Protocols_Hooks.h \ + $(ACE_ROOT)/ace/pre.h Protocols_Hooks.h ORB_Core.h \ + corbafwd.h $(ACE_ROOT)/ace/CDR_Base.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 ORB.h \ + corbafwd.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + 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 \ + ORB.i Environment.h \ + Policy_Manager.h LocalObject.h \ + LocalObject.i \ + 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 \ + 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_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 \ + TAO_Singleton.h \ + TAO_Singleton_Manager.h 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 \ + 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 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 RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i ORB_Core.i \ + RTCORBAC.h RT_Protocols_Hooks.i \ + Invocation.h \ + Stub.h \ + 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 \ + ORB_Core.h \ + Stub.i \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + 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 \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp + .obj/Pool_Per_Endpoint.o .obj/Pool_Per_Endpoint.so .shobj/Pool_Per_Endpoint.o .shobj/Pool_Per_Endpoint.so: Pool_Per_Endpoint.cpp \ Pool_Per_Endpoint.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 \ @@ -29206,13 +31109,31 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ Priority_Mapping_Manager.h \ Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ debug.h \ @@ -29223,8 +31144,6 @@ 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 \ @@ -29356,12 +31275,9 @@ realclean: TAOS_T.cpp \ TAOS.i -.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp \ - orbconf.h \ +.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp 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 \ @@ -29383,8 +31299,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 \ @@ -29465,8 +31381,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 \ @@ -29487,21 +31403,19 @@ 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 \ @@ -29670,8 +31584,6 @@ 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 \ @@ -29817,15 +31729,138 @@ realclean: LocalObject.i \ RT_PolicyFactory.h \ RTCORBAC.h \ - RTCORBAC.i + RTCORBAC.i \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + RT_Protocols_Hooks.h \ + Protocols_Hooks.h \ + 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 \ + RT_Protocols_Hooks.i .obj/Private_Connection_Descriptor.o .obj/Private_Connection_Descriptor.so .shobj/Private_Connection_Descriptor.o .shobj/Private_Connection_Descriptor.so: Private_Connection_Descriptor.cpp \ Private_Connection_Descriptor.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 \ @@ -29931,8 +31966,6 @@ 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 \ @@ -30069,8 +32102,6 @@ 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 \ @@ -30253,8 +32284,6 @@ 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 \ @@ -30503,6 +32532,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.so .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.so: GIOP_Message_Base.cpp \ @@ -30512,8 +32561,6 @@ 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 \ @@ -30787,6 +32834,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -30808,8 +32875,6 @@ 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 \ @@ -31073,6 +33138,24 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ operation_details.h \ Service_Context.h \ @@ -31100,8 +33183,6 @@ 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 \ @@ -31233,8 +33314,6 @@ 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 \ @@ -31403,8 +33482,6 @@ 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 \ @@ -31509,8 +33586,6 @@ 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 \ @@ -31793,6 +33868,24 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ 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: \ @@ -31804,8 +33897,6 @@ 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 \ @@ -31911,8 +34002,6 @@ 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 \ @@ -32162,6 +34251,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \ @@ -32170,8 +34279,6 @@ 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 \ @@ -32291,8 +34398,6 @@ 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 \ @@ -32406,8 +34511,6 @@ 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 \ @@ -32659,6 +34762,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i .obj/Tagged_Profile.o .obj/Tagged_Profile.so .shobj/Tagged_Profile.o .shobj/Tagged_Profile.so: Tagged_Profile.cpp \ @@ -32666,8 +34789,6 @@ 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 \ @@ -32920,6 +35041,26 @@ realclean: Object_Ref_Table.h \ Interceptor_List.h \ Interceptor_List.inl \ + RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h \ ORB_Core.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 68c3997c5ac..2be6f14ed1b 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -36,6 +36,7 @@ #include "Invocation.h" #include "Invocation_Endpoint_Selectors.h" +#include "RT_Invocation_Endpoint_Selectors.h" #include "IORInfo.h" @@ -63,10 +64,12 @@ TAO_default_environment () TAO_ORB_Core::Timeout_Hook TAO_ORB_Core::timeout_hook_ = 0; TAO_ORB_Core::Sync_Scope_Hook TAO_ORB_Core::sync_scope_hook_ = 0; const char * TAO_ORB_Core::resource_factory_name_ = "Resource_Factory"; +const char *TAO_ORB_Core::protocols_hooks_name_ = "Protocols_Hooks"; const char * TAO_ORB_Core::dynamic_adapter_name_ = "Dynamic_Adapter"; TAO_ORB_Core::TAO_ORB_Core (const char *orbid) - : lock_ (), + : protocols_hooks_ (0), + lock_ (), connector_registry_ (0), acceptor_registry_ (0), protocol_factories_ (0), @@ -1247,6 +1250,39 @@ TAO_ORB_Core::resource_factory (void) } void +TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks) +{ + TAO_ORB_Core::protocols_hooks_name_ = protocols_hooks; +} + +TAO_Protocols_Hooks * +TAO_ORB_Core::get_protocols_hooks (void) +{ + if (TAO_ORB_Core::protocols_hooks_ == 0) + { + // Look in the service repository for an instance. + this->protocols_hooks_ = + ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance + (TAO_ORB_Core::protocols_hooks_name_); + } + + if (TAO_ORB_Core::protocols_hooks_name_ == 0) + { + // Still don't have one, so let's allocate the default. This + // will throw an exception if it fails on exception-throwing + // platforms. + TAO_Protocols_Hooks *protocols_hooks; + ACE_NEW_RETURN (protocols_hooks, + TAO_Protocols_Hooks, + 0); + + this->protocols_hooks_ = protocols_hooks; + } + + return this->protocols_hooks_; +} + +void TAO_ORB_Core::services_callbacks_init (void) { // We (should) know what are the services that would need @@ -2601,10 +2637,10 @@ TAO_ORB_Core::stubless_relative_roundtrip_timeout (void) #if (TAO_HAS_RT_CORBA == 1) -TAO_ThreadpoolPolicy * +CORBA::Policy * TAO_ORB_Core::threadpool (void) { - TAO_ThreadpoolPolicy *result = 0; + CORBA::Policy *result = 0; // @@ Must lock, but is is harder to implement than just modifying // this call: the ORB does take a lock to modify the policy @@ -2620,10 +2656,10 @@ TAO_ORB_Core::threadpool (void) return result; } -TAO_PriorityModelPolicy * +CORBA::Policy * TAO_ORB_Core::priority_model (void) { - TAO_PriorityModelPolicy *result = 0; + CORBA::Policy *result = 0; // @@ Must lock, but is is harder to implement than just modifying // this call: the ORB does take a lock to modify the policy @@ -2639,10 +2675,10 @@ TAO_ORB_Core::priority_model (void) return result; } -TAO_ServerProtocolPolicy * +CORBA::Policy * TAO_ORB_Core::server_protocol (void) { - TAO_ServerProtocolPolicy *result = 0; + CORBA::Policy *result = 0; // @@ Must lock, but is is harder to implement than just modifying // this call: the ORB does take a lock to modify the policy diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index c829788c543..77ceab75100 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -41,6 +41,9 @@ #include "PortableInterceptorC.h" #include "Interceptor_List.h" +#include "RT_Policy_i.h" +#include "Protocols_Hooks.h" + #include "ace/Hash_Map_Manager.h" // Forward declarations @@ -76,6 +79,7 @@ class TAO_Bands_Protocol_Selector; class TAO_Client_Priority_Policy_Selector; class TAO_Message_State_Factory; class TAO_ServerRequest; +class TAO_Protocols_Hooks; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -377,11 +381,20 @@ public: /// Returns pointer to the server factory. TAO_Server_Strategy_Factory *server_factory (void); + + /// Returns pointer to the Protocol_Hooks + TAO_Protocols_Hooks *protocols_hooks (void); //@} /// Sets the value of TAO_ORB_Core::resource_factory_ static void set_resource_factory (const char *resource_factory_name); + /// Sets the value of TAO_ORB_Core::protocols_hooks_ + static void set_protocols_hooks (const char *protocols_hooks_name); + + /// Gets the value of TAO_ORB_Core::protocols_hooks__ + TAO_Protocols_Hooks * get_protocols_hooks (void); + /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); @@ -551,13 +564,12 @@ public: /// Methods for obtaining ORB implementation default values for RT /// policies. //@{ - TAO_PrivateConnectionPolicy *default_private_connection (void) const; - TAO_PriorityBandedConnectionPolicy * - default_priority_banded_connection (void) const; - TAO_ClientProtocolPolicy *default_client_protocol (void) const; - TAO_ServerProtocolPolicy *default_server_protocol (void) const; - TAO_ThreadpoolPolicy *default_threadpool (void) const; - TAO_PriorityModelPolicy *default_priority_model (void) const; + CORBA::Policy *default_private_connection (void) const; + CORBA::Policy *default_priority_banded_connection (void) const; + CORBA::Policy *default_client_protocol (void) const; + CORBA::Policy *default_server_protocol (void) const; + CORBA::Policy *default_threadpool (void) const; + CORBA::Policy *default_priority_model (void) const; //@} /** @@ -571,13 +583,22 @@ public: * check the ORB implementation default values. */ //@{ - TAO_ThreadpoolPolicy *threadpool (void); - TAO_PriorityModelPolicy *priority_model (void); - TAO_ServerProtocolPolicy *server_protocol (void); + CORBA::Policy *threadpool (void); + CORBA::Policy *priority_model (void); + CORBA::Policy *server_protocol (void); //@} #endif /* TAO_HAS_RT_CORBA == 1 */ + /// Handle to the factory for protocols_hooks_.. + TAO_Protocols_Hooks *protocols_hooks_; + + // Name of the protocols_hooks that needs to be instantiated. + // The default value is "Protocols_Hooks". If RTCORBA option is + // set, its value will be set to + // be "RT_Protocols_Hooks". + static const char *protocols_hooks_name_; + /** * Accessor and modifier to the current thread priority, used to * implement the RTCORBA::Current interface, but it is faster for diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index cd03c48d3f6..35f1e77cad4 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -331,37 +331,37 @@ TAO_ORB_Core::default_buffering_constraint (void) const #if (TAO_HAS_RT_CORBA == 1) -ACE_INLINE TAO_ThreadpoolPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_threadpool (void) const { return this->default_policies_->threadpool (); } -ACE_INLINE TAO_PriorityModelPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_priority_model (void) const { return this->default_policies_->priority_model (); } -ACE_INLINE TAO_ServerProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_server_protocol (void) const { return this->default_policies_->server_protocol (); } -ACE_INLINE TAO_ClientProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_client_protocol (void) const { return this->default_policies_->client_protocol (); } -ACE_INLINE TAO_PrivateConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_private_connection (void) const { return this->default_policies_->private_connection (); } -ACE_INLINE TAO_PriorityBandedConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_priority_banded_connection (void) const { return this->default_policies_->priority_banded_connection (); diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 0d6e0c3f45b..616fa611e3f 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -109,69 +109,83 @@ TAO_Policy_Manager_Impl::copy_from (TAO_Policy_Manager_Impl *source, if (source->priority_model_ != 0) { - ACE_NEW_THROW_EX (this->priority_model_, - TAO_PriorityModelPolicy (*source->priority_model_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + this->priority_model_ = + source->priority_model_->copy (ACE_TRY_ENV); ACE_CHECK; + // Check that cloning succeeded. + if (this->priority_model_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + this->count_++; } if (source->threadpool_ != 0) { - ACE_NEW_THROW_EX (this->threadpool_, - TAO_ThreadpoolPolicy (*source->threadpool_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + this->threadpool_ = + source->threadpool_->copy (ACE_TRY_ENV); ACE_CHECK; + // Check that cloning succeeded. + if (this->threadpool_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); this->count_++; } if (source->private_connection_ != 0) { - ACE_NEW_THROW_EX (this->private_connection_, - TAO_PrivateConnectionPolicy (*source->private_connection_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + + this->private_connection_ = + source->private_connection_->copy (ACE_TRY_ENV); ACE_CHECK; + // Check that cloning succeeded. + if (this->private_connection_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + this->count_++; } if (source->priority_banded_connection_ != 0) { - ACE_NEW_THROW_EX (this->priority_banded_connection_, - TAO_PriorityBandedConnectionPolicy - (*source->priority_banded_connection_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + this->priority_banded_connection_ = + source->priority_banded_connection_->copy (ACE_TRY_ENV); ACE_CHECK; + // Check that cloning succeeded. + if (this->priority_banded_connection_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); + this->count_++; } if (source->server_protocol_ != 0) { - ACE_NEW_THROW_EX (this->server_protocol_, - TAO_ServerProtocolPolicy (*source->server_protocol_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + this->server_protocol_ = + source->server_protocol_->copy (ACE_TRY_ENV); ACE_CHECK; + // Check that cloning succeeded. + if (this->server_protocol_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); this->count_++; } if (source->client_protocol_ != 0) { - ACE_NEW_THROW_EX (this->client_protocol_, - TAO_ClientProtocolPolicy - (*source->client_protocol_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, - CORBA::COMPLETED_NO)); + this->client_protocol_ = + source->client_protocol_->copy (ACE_TRY_ENV); ACE_CHECK; - + + // Check that cloning succeeded. + if (this->client_protocol_ == 0) + ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::COMPLETED_NO)); this->count_++; } @@ -287,7 +301,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( this->relative_roundtrip_timeout_ = policy._retn (); if (CORBA::is_nil (this->relative_roundtrip_timeout_)) continue; - + this->count_++; } break; @@ -322,7 +336,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( this->sync_scope_ = policy._retn (); if (CORBA::is_nil (this->sync_scope_)) continue; - + this->count_++; } break; @@ -356,20 +370,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIORITY_MODEL_POLICY_TYPE: { - RTCORBA::PriorityModelPolicy_var p = - RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->priority_model_); - this->priority_model_ = - ACE_dynamic_cast (TAO_PriorityModelPolicy *, - p._retn ()); + this->priority_model_ = policy._retn (); + if (CORBA::is_nil (this->priority_model_)) + continue; this->count_++; } @@ -377,20 +380,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_THREADPOOL_POLICY_TYPE: { - RTCORBA::ThreadpoolPolicy_var p = - RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->threadpool_); - this->threadpool_ = - ACE_dynamic_cast (TAO_ThreadpoolPolicy *, - p._retn ()); + this->threadpool_ = policy._retn (); + if (CORBA::is_nil (this->threadpool_)) + continue; this->count_++; } @@ -398,20 +390,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIVATE_CONNECTION_POLICY_TYPE: { - RTCORBA::PrivateConnectionPolicy_var p = - RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->private_connection_); - this->private_connection_ = - ACE_dynamic_cast (TAO_PrivateConnectionPolicy *, - p._retn ()); + this->private_connection_ = policy._retn (); + if (CORBA::is_nil (this->private_connection_)) + continue; this->count_++; } @@ -419,20 +400,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIORITY_BANDED_CONNECTION_POLICY_TYPE: { - RTCORBA::PriorityBandedConnectionPolicy_var p = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->priority_banded_connection_); - this->priority_banded_connection_ = - ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *, - p._retn ()); + this->priority_banded_connection_ = policy._retn (); + if (CORBA::is_nil (this->priority_banded_connection_)) + continue; this->count_++; } @@ -451,20 +421,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( else server_protocol_set = 0; - RTCORBA::ServerProtocolPolicy_var p = - RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->server_protocol_); - this->server_protocol_ = - ACE_dynamic_cast (TAO_ServerProtocolPolicy *, - p._retn ()); + this->server_protocol_ = policy._retn (); + if (CORBA::is_nil (this->server_protocol_)) + continue; this->count_++; } @@ -472,20 +431,9 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_CLIENT_PROTOCOL_POLICY_TYPE: { - RTCORBA::ClientProtocolPolicy_var p = - RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL - (CORBA_SystemException::_tao_minor_code - (TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->client_protocol_); - this->client_protocol_ = - ACE_dynamic_cast (TAO_ClientProtocolPolicy *, - p._retn ()); + this->client_protocol_ = policy._retn (); + if (CORBA::is_nil (this->client_protocol_)) + continue; this->count_++; } @@ -979,10 +927,10 @@ TAO_Policy_Manager_Impl::buffering_constraint (void) const #if (TAO_HAS_RT_CORBA == 1) -TAO_ThreadpoolPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::threadpool (void) const { - TAO_ThreadpoolPolicy *result = + CORBA::Policy *result = this->threadpool_; if (result != 0) @@ -990,10 +938,10 @@ TAO_Policy_Manager_Impl::threadpool (void) const return result; } -TAO_PriorityModelPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::priority_model (void) const { - TAO_PriorityModelPolicy *result = +CORBA::Policy *result = this->priority_model_; if (result != 0) @@ -1001,10 +949,10 @@ TAO_Policy_Manager_Impl::priority_model (void) const return result; } -TAO_PrivateConnectionPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::private_connection (void) const { - TAO_PrivateConnectionPolicy *result = + CORBA::Policy *result = this->private_connection_; if (result != 0) @@ -1012,10 +960,10 @@ TAO_Policy_Manager_Impl::private_connection (void) const return result; } -TAO_PriorityBandedConnectionPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::priority_banded_connection (void) const { - TAO_PriorityBandedConnectionPolicy *result = + CORBA::Policy *result = this->priority_banded_connection_; if (result != 0) @@ -1023,10 +971,10 @@ TAO_Policy_Manager_Impl::priority_banded_connection (void) const return result; } -TAO_ServerProtocolPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::server_protocol (void) const { - TAO_ServerProtocolPolicy *result = + CORBA::Policy *result = this->server_protocol_; if (result != 0) @@ -1034,10 +982,10 @@ TAO_Policy_Manager_Impl::server_protocol (void) const return result; } -TAO_ClientProtocolPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::client_protocol (void) const { - TAO_ClientProtocolPolicy *result = + CORBA::Policy *result = this->client_protocol_; if (result != 0) diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 680038cca93..796ae329440 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -121,12 +121,12 @@ public: #if (TAO_HAS_RT_CORBA == 1) - TAO_PriorityModelPolicy *priority_model (void) const; - TAO_ThreadpoolPolicy *threadpool (void) const; - TAO_PrivateConnectionPolicy *private_connection (void) const; - TAO_PriorityBandedConnectionPolicy *priority_banded_connection (void) const; - TAO_ServerProtocolPolicy *server_protocol (void) const; - TAO_ClientProtocolPolicy *client_protocol (void) const; + CORBA::Policy *priority_model (void) const; + CORBA::Policy *threadpool (void) const; + CORBA::Policy *private_connection (void) const; + CORBA::Policy *priority_banded_connection (void) const; + CORBA::Policy *server_protocol (void) const; + CORBA::Policy *client_protocol (void) const; // = Speedy policy setters. Take ownership of the argument policy // objects - no copying. @@ -167,12 +167,12 @@ private: #if (TAO_HAS_RT_CORBA == 1) - TAO_PriorityModelPolicy *priority_model_; - TAO_ThreadpoolPolicy *threadpool_; - TAO_PrivateConnectionPolicy *private_connection_; - TAO_PriorityBandedConnectionPolicy *priority_banded_connection_; - TAO_ServerProtocolPolicy *server_protocol_; - TAO_ClientProtocolPolicy *client_protocol_; + CORBA::Policy *priority_model_; + CORBA::Policy *threadpool_; + CORBA::Policy *private_connection_; + CORBA::Policy *priority_banded_connection_; + CORBA::Policy *server_protocol_; + CORBA::Policy *client_protocol_; #endif /* TAO_HAS_RT_CORBA == 1 */ @@ -234,12 +234,12 @@ public: #if (TAO_HAS_RT_CORBA == 1) - TAO_PriorityModelPolicy *priority_model (void); - TAO_ThreadpoolPolicy *threadpool (void); - TAO_PrivateConnectionPolicy *private_connection (void); - TAO_PriorityBandedConnectionPolicy *priority_banded_connection (void); - TAO_ServerProtocolPolicy *server_protocol (void); - TAO_ClientProtocolPolicy *client_protocol (void); + CORBA::Policy *priority_model (void); + CORBA::Policy *threadpool (void); + CORBA::Policy *private_connection (void); + CORBA::Policy *priority_banded_connection (void); + CORBA::Policy *server_protocol (void); + CORBA::Policy *client_protocol (void); #endif /* TAO_HAS_RT_CORBA == 1 */ @@ -292,9 +292,9 @@ public: #if (TAO_HAS_RT_CORBA == 1) - TAO_PrivateConnectionPolicy *private_connection (void) const; - TAO_PriorityBandedConnectionPolicy *priority_banded_connection (void) const; - TAO_ClientProtocolPolicy *client_protocol (void) const; + CORBA::Policy *private_connection (void) const; + CORBA::Policy *priority_banded_connection (void) const; + CORBA::Policy *client_protocol (void) const; #endif /* TAO_HAS_RT_CORBA == 1 */ @@ -356,9 +356,9 @@ public: #if (TAO_HAS_RT_CORBA == 1) - TAO_PrivateConnectionPolicy *private_connection (void) const; - TAO_PriorityBandedConnectionPolicy *priority_banded_connection (void) const; - TAO_ClientProtocolPolicy *client_protocol (void) const; + CORBA::Policy *private_connection (void) const; + CORBA::Policy *priority_banded_connection (void) const; + CORBA::Policy *client_protocol (void) const; #endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index ace3f0f3f11..14ab2cde5da 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -96,7 +96,7 @@ TAO_Policy_Manager::client_priority (void) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.client_priority (); - } + } return 0; } @@ -132,7 +132,7 @@ TAO_Policy_Manager::buffering_constraint (void) #if (TAO_HAS_RT_CORBA == 1) -ACE_INLINE TAO_PriorityModelPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::priority_model (void) { // Double-checked locking. @@ -144,7 +144,7 @@ TAO_Policy_Manager::priority_model (void) return 0; } -ACE_INLINE TAO_ThreadpoolPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::threadpool (void) { // Double-checked locking. @@ -156,7 +156,7 @@ TAO_Policy_Manager::threadpool (void) return 0; } -ACE_INLINE TAO_PrivateConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::private_connection (void) { // Double-checked locking. @@ -168,7 +168,7 @@ TAO_Policy_Manager::private_connection (void) return 0; } -ACE_INLINE TAO_PriorityBandedConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::priority_banded_connection (void) { // Double-checked locking. @@ -180,7 +180,7 @@ TAO_Policy_Manager::priority_banded_connection (void) return 0; } -ACE_INLINE TAO_ServerProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::server_protocol (void) { // Double-checked locking. @@ -192,7 +192,7 @@ TAO_Policy_Manager::server_protocol (void) return 0; } -ACE_INLINE TAO_ClientProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::client_protocol (void) { // Double-checked locking. @@ -255,20 +255,20 @@ TAO_Policy_Current_Impl::buffering_constraint (void) const #if (TAO_HAS_RT_CORBA == 1) -ACE_INLINE TAO_PrivateConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current_Impl::private_connection (void) const { return this->manager_impl_.private_connection (); } -ACE_INLINE TAO_PriorityBandedConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current_Impl::priority_banded_connection (void) const { return this->manager_impl_.priority_banded_connection (); } -ACE_INLINE TAO_ClientProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current_Impl::client_protocol (void) const { return this->manager_impl_.client_protocol (); @@ -354,7 +354,7 @@ TAO_Policy_Current::buffering_constraint (void) const #if (TAO_HAS_RT_CORBA == 1) -ACE_INLINE TAO_PrivateConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current::private_connection (void) const { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -362,7 +362,7 @@ TAO_Policy_Current::private_connection (void) const return impl.private_connection (); } -ACE_INLINE TAO_PriorityBandedConnectionPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current::priority_banded_connection (void) const { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -370,7 +370,7 @@ TAO_Policy_Current::priority_banded_connection (void) const return impl.priority_banded_connection (); } -ACE_INLINE TAO_ClientProtocolPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current::client_protocol (void) const { TAO_Policy_Current_Impl &impl = this->implementation (); diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index 2cc561a0f46..199c3cda9df 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -95,8 +95,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -191,9 +189,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 \ - RTPortableServerC.h PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/corbafwd.i RTPortableServerC.h \ + PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -229,9 +226,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -274,20 +270,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i .obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -413,9 +405,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - POA.h Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i POA.h \ + Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -458,22 +449,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i POAManager.h POAManager.i \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -485,9 +474,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/RTPortableServerC.o .obj/RTPortableServerC.so .shobj/RTPortableServerC.o .shobj/RTPortableServerC.so: RTPortableServerC.cpp RTPortableServerC.h \ $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - 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 \ @@ -619,15 +605,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i .obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h $(ACE_ROOT)/ace/pre.h \ $(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 \ @@ -795,26 +778,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i POAManager.h POAManager.i \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ - ImplRepoS.h ImplRepoC.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i ImplRepoS.h \ + ImplRepoC.h $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -899,22 +879,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.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/debug.h \ - $(TAO_ROOT)/tao/Acceptor_Registry.h \ - $(TAO_ROOT)/tao/Acceptor_Registry.i \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAS.h \ $(TAO_ROOT)/tao/IOPS.h \ @@ -932,6 +896,23 @@ 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/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.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/debug.h \ + $(TAO_ROOT)/tao/Acceptor_Registry.h \ + $(TAO_ROOT)/tao/Acceptor_Registry.i \ $(TAO_ROOT)/tao/BiDir_Policy_i.h \ $(TAO_ROOT)/tao/BiDirPolicyC.h \ $(TAO_ROOT)/tao/BiDirPolicyC.i \ @@ -946,9 +927,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.so .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.so: Default_Acceptor_Filter.cpp \ Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \ - 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 \ @@ -1129,8 +1107,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -1139,8 +1115,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl Key_Adapters.h \ - PortableServerC.h \ - $(TAO_ROOT)/tao/corbafwd.h \ + PortableServerC.h $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1301,22 +1276,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i POA.h POAManager.h POAManager.i \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + POA.h POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ Strategized_Object_Proxy_Broker.h \ @@ -1430,6 +1403,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1476,8 +1467,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -1651,9 +1640,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \ $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - 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 \ @@ -1827,9 +1813,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \ $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - 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 \ @@ -1957,9 +1940,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i PortableServerC.i \ poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i POAManager.i \ - POA.h Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(TAO_ROOT)/tao/LocalObject.i POAManager.i POA.h \ + Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -2003,26 +1985,21 @@ 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 \ - RTPortableServerC.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i Object_Adapter.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ - PortableServerC.h portableserver_export.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/pre.h Key_Adapters.h PortableServerC.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2201,9 +2178,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \ $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - 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 \ @@ -2374,26 +2348,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i POAManager.h POAManager.i \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ - Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ + Operation_Table.h $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -2480,6 +2451,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -2509,8 +2498,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2678,22 +2665,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i POAManager.h POAManager.i \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ ThruPOA_Object_Proxy_Impl.h \ @@ -2781,6 +2766,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -2798,8 +2801,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Direct_Object_Proxy_Impl.o .obj/Direct_Object_Proxy_Impl.so .shobj/Direct_Object_Proxy_Impl.o .shobj/Direct_Object_Proxy_Impl.so: Direct_Object_Proxy_Impl.cpp \ Direct_Object_Proxy_Impl.h portableserver_export.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 \ @@ -2970,28 +2971,23 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Servant_Base.h Servant_Base.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i .obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.so .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.so: Strategized_Object_Proxy_Broker.cpp \ Strategized_Object_Proxy_Broker.h portableserver_export.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 \ @@ -3269,6 +3265,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -3281,8 +3297,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -3314,8 +3328,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -3416,8 +3428,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i Servant_Base.h \ - PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ + PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ @@ -3487,22 +3498,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -3586,6 +3595,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -3600,11 +3627,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i -.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h PortableServerC.h \ - portableserver_export.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ +.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h $(ACE_ROOT)/ace/pre.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3856,22 +3880,50 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/Invocation.h \ + $(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/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 \ @@ -3884,19 +3936,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/DomainC.i Collocated_Object.h \ + Collocated_Object.i ServerRequestInfo.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i DomainS_T.h \ DomainS_T.i DomainS_T.cpp DomainS.i Object_Adapter.h Key_Adapters.h \ @@ -3912,9 +3956,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 RTPortableServerC.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i 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 \ @@ -3923,8 +3966,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Stub.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i @@ -3932,8 +3973,6 @@ 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 \ @@ -4183,22 +4222,50 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/Invocation.h \ + $(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/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 \ @@ -4211,14 +4278,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -4235,9 +4294,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 RTPortableServerC.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i 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 \ @@ -4248,15 +4306,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Stub.i + $(TAO_ROOT)/tao/TAO_Server_Request.i .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ $(ACE_ROOT)/ace/pre.h PortableServer.h \ - 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 \ @@ -4351,9 +4404,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 \ - RTPortableServerC.h PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/corbafwd.i RTPortableServerC.h \ + PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ @@ -4389,8 +4441,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -4401,8 +4453,6 @@ 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 \ @@ -4554,8 +4604,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \ $(ACE_ROOT)/ace/pre.h 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 \ @@ -4816,6 +4864,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/NVList.h \ @@ -4827,8 +4895,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -4846,9 +4912,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ - 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 \ @@ -5015,9 +5078,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 \ - Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Object_Adapter.h \ + Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -5032,22 +5094,20 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i poa_macros.h \ + RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i Active_Object_Map.h \ + $(TAO_ROOT)/tao/RTCORBAC.i RTPortableServerC.i \ + Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ + Active_Object_Map.i $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/LocalObject.i Object_Adapter.i \ + $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -5132,6 +5192,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ @@ -5151,8 +5229,6 @@ 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 \ @@ -5400,25 +5476,39 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i \ - PortableServerC.h portableserver_export.h PortableServerC.i \ - Servant_Base.h Servant_Base.i Collocated_Object.h Collocated_Object.i \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ $(TAO_ROOT)/tao/TimeBaseS.i \ - ThruPOA_Object_Proxy_Impl.h \ - portableserver_export.h \ - Direct_Object_Proxy_Impl.h \ - ServerRequestInfo.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i PortableServerC.h \ + portableserver_export.h PortableServerC.i Servant_Base.h \ + Servant_Base.i Collocated_Object.h Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i MessagingS_T.h \ MessagingS_T.i MessagingS_T.cpp MessagingS.i Operation_Table.h \ - Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -5430,11 +5520,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(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 \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i 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 \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ @@ -5464,8 +5551,6 @@ 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 \ @@ -5597,8 +5682,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBAC.i \ - RT_Acceptor_Filters.i \ + $(TAO_ROOT)/tao/RTCORBAC.i RT_Acceptor_Filters.i \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 3e9d3f17165..cb768d054cb 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -3383,9 +3383,14 @@ TAO_POA_Policies::TAO_POA_Policies (TAO_ORB_Core &orb_core, #if (TAO_HAS_RT_CORBA == 1) - RTCORBA::PriorityModelPolicy_var priority_model = + CORBA::Policy_var policy = orb_core.priority_model (); + RTCORBA::PriorityModelPolicy_var priority_model = + RTCORBA::PriorityModelPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_CHECK; + if (!CORBA::is_nil (priority_model.in ())) { RTCORBA::PriorityModel rt_priority_model = @@ -3400,13 +3405,21 @@ TAO_POA_Policies::TAO_POA_Policies (TAO_ORB_Core &orb_core, ACE_CHECK; } - TAO_ServerProtocolPolicy *server_protocol = + CORBA::Policy_var protocol = orb_core.server_protocol (); + RTCORBA::ServerProtocolPolicy_var server_protocol_ptr = + RTCORBA::ServerProtocolPolicy::_narrow (protocol.in (), + ACE_TRY_ENV); + ACE_CHECK; + + TAO_ServerProtocolPolicy *server_protocol = + ACE_static_cast (TAO_ServerProtocolPolicy *, + server_protocol_ptr.in ()); + if (server_protocol != 0) { this->server_protocol (server_protocol); - server_protocol->_remove_ref (); } #else @@ -3852,8 +3865,8 @@ TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy, if (!CORBA::is_nil (priority_bands.in ())) { TAO_PriorityBandedConnectionPolicy *priority_bands_i = - ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *, - priority_bands.in ()); + ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, + priority_bands.in ()); this->priority_bands (priority_bands_i); @@ -3877,8 +3890,8 @@ TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy, if (!CORBA::is_nil (server_protocol.in ())) { TAO_ServerProtocolPolicy *server_protocol_i = - ACE_dynamic_cast (TAO_ServerProtocolPolicy *, - server_protocol.in ()); + ACE_static_cast (TAO_ServerProtocolPolicy *, + server_protocol.in ()); this->server_protocol (server_protocol_i); diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp new file mode 100644 index 00000000000..5a532c1dda7 --- /dev/null +++ b/TAO/tao/Protocols_Hooks.cpp @@ -0,0 +1,112 @@ +// $Id$ + +#include "Protocols_Hooks.h" +#include "ace/Dynamic_Service.h" + +ACE_RCSID(tao, Protocols_Hooks, "$Id$") + +/// constructor +TAO_Protocols_Hooks::TAO_Protocols_Hooks (void) +{ +} + +/// destructor +TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void) +{ +} + +int +TAO_Protocols_Hooks::call_client_protocols_hook (TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *) +{ + return 0; +} + + +int +TAO_Protocols_Hooks::call_server_protocols_hook (TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *) +{ + return 0; +} + +void +TAO_Protocols_Hooks::call_policy_type_hook (CORBA::PolicyList *&, + CORBA::ULong &) +{ + return; +} + +void +TAO_Protocols_Hooks::validate_policy_type (CORBA::ULong, + CORBA::ULong &, + CORBA::Environment &) +{ + return; +} + +void +TAO_Protocols_Hooks::add_rt_service_context_hook (TAO_GIOP_Invocation *, + CORBA::Policy *, + CORBA::Short &, + CORBA::Environment + &) +{ + return; +} + +void +TAO_Protocols_Hooks::get_selector_hook (CORBA::Policy *, + CORBA::Boolean &, + CORBA::Short &) +{ + return; +} + +void +TAO_Protocols_Hooks:: get_selector_bands_policy_hook ( + CORBA::Policy *, + CORBA::Short &, + CORBA::Short &, + CORBA::Short &, + int &) +{ + return; +} + +void +TAO_Protocols_Hooks::select_endpoint_hook (TAO_GIOP_Invocation *, + CORBA::Policy *, + TAO_Profile *&, + CORBA::Environment &) +{ + return; +} + +CORBA::Policy * +TAO_Protocols_Hooks::effective_priority_banded_connection_hook (CORBA::Policy *, + CORBA::Policy *, + CORBA::Environment &) +{ + return CORBA::Policy::_nil (); +} + +CORBA::Policy * +TAO_Protocols_Hooks::effective_client_protocol_hook (CORBA::Policy *, + CORBA::Policy *, + CORBA::Environment &) +{ + return CORBA::Policy::_nil (); +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Dynamic_Service<TAO_Protocols_Hooks>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Dynamic_Service<TAO_Protocols_Hooks> + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h new file mode 100644 index 00000000000..46d0ec8bafd --- /dev/null +++ b/TAO/tao/Protocols_Hooks.h @@ -0,0 +1,96 @@ +// -*- C++ -*- + +// =================================================================== +/** + * @file Protocols_Hooks.h + * + * $Id$ + * + * @author Priyanka Gontla <pgontla@ece.uci.edu> + * + */ +// =================================================================== + +#ifndef TAO_PROTOCOLS_HOOKS_H +#define TAO_PROTOCOLS_HOOKS_H +#include "ace/pre.h" + +#include "ORB_Core.h" +#include "RTCORBAC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Service_Object.h" + +class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object +{ +public: + + /// constructor + TAO_Protocols_Hooks (void); + + /// destructor + virtual ~TAO_Protocols_Hooks (void); + + virtual int call_client_protocols_hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type); + + virtual int call_server_protocols_hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type); + + + /** + * to get the policy_type in Long format. + * + */ + virtual void call_policy_type_hook (CORBA::PolicyList *&policy_list, + CORBA::ULong &policy_type); + + virtual void validate_policy_type (CORBA::ULong slot, + CORBA::ULong &type_value, + CORBA::Environment &ACE_TRY_ENV); + + virtual void add_rt_service_context_hook ( + TAO_GIOP_Invocation *invocation, + CORBA::Policy *model_policy, + CORBA::Short &client_priority, + CORBA::Environment &ACE_TRY_ENV); + + virtual void get_selector_hook (CORBA::Policy *model_policy, + CORBA::Boolean + &is_client_propagated, + CORBA::Short &server_priority); + + virtual void get_selector_bands_policy_hook ( + CORBA::Policy *bands_policy, + CORBA::Short &min_priority, + CORBA::Short &max_priority, + CORBA::Short &p, + int &in_range); + + virtual void select_endpoint_hook (TAO_GIOP_Invocation *invocation, + CORBA::Policy *client_protocol_policy, + TAO_Profile *&profile, + CORBA::Environment &ACE_TRY_ENV); + + /** + * Hook to check and override the exposed policies if needed + * + */ + virtual CORBA::Policy *effective_priority_banded_connection_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); + + virtual CORBA::Policy *effective_client_protocol_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); +}; + +#include "ace/post.h" +#endif /* TAO_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RT_Invocation_Endpoint_Selectors.cpp new file mode 100644 index 00000000000..23fb31d3370 --- /dev/null +++ b/TAO/tao/RT_Invocation_Endpoint_Selectors.cpp @@ -0,0 +1,606 @@ +// $Id$ + +#include "tao/RT_Invocation_Endpoint_Selectors.h" + +#if !defined (__ACE_INLINE__) +#include "tao/RT_Invocation_Endpoint_Selectors.i" +#endif /* __ACE_INLINE__ */ + +#include "tao/Invocation.h" +#include "tao/RT_Policy_i.h" +#include "tao/Client_Priority_Policy.h" +#include "tao/Stub.h" +#include "tao/Profile.h" +#include "tao/Endpoint.h" + +ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$") + +// **************************************************************** + +#if (TAO_HAS_RT_CORBA == 1) + +TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void) +{ +} + +void +TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + // Obtain profile. + invocation->profile_ = invocation->stub_->profile_in_use (); + + // Select an endpoint from the profile. + + if (invocation->profile_->endpoint_count () == 0) + { + // Unknown protocol - move onto the next profile. + this->next (invocation, ACE_TRY_ENV); + ACE_CHECK; + this->select_endpoint (invocation, ACE_TRY_ENV); + } + + else if (invocation->profile_->endpoint_count () == 1) + { + // Profile contains just one endpoint. This happens when: + // a) we are talking to a nonTAO server (which doesn't have + // the concept of multiple endpoints per profile) + // or + // b) we have TAO server with a non-lane threadpool, in which + // case there is only one acceptor + // In both cases we should use the endpoint regardless of its priority. + invocation->endpoint_ = invocation->profile_->endpoint (); + } + else + { + // Profiles contains more than one endpoint. Find one with the + // right priority. + TAO_Endpoint *endpoint = 0; + for (TAO_Endpoint *endp = invocation->profile_->endpoint (); + endp != 0; + endp = endp->next ()) + { + if (endp->priority () + == invocation->endpoint_selection_state_.client_priority_) + { + endpoint = endp; + break; + } + } + + if (endpoint != 0) + { + // Found an Endpoint with correct priority. + invocation->endpoint_ = endpoint; + } + else + { + // The profile didn't contain an endpoint with matching priority. + // There are two possibilities: + // a) the server is a multi-homed host and this is the + // only reason for profile containing more than 1 + // endpoint, i.e., case a) above. + // b) we have misconfiguration - threadpool with lanes on + // the server, and client priority not matching any of + // the lanes. + if (this->is_multihomed (invocation->profile_->endpoint ())) + { + // case a + invocation->endpoint_ = invocation->profile_->endpoint (); + } + else + // case b + { + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + CORBA::Policy::_duplicate (invocation-> + endpoint_selection_state_.priority_model_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + } + } +} + +int +TAO_Priority_Endpoint_Selector::is_multihomed (TAO_Endpoint *endpoint) +{ + for (TAO_Endpoint *endp = endpoint; + endp != 0; + endp = endp->next ()) + { + if (endp->next () != 0 + && endp->priority () != endp->next ()->priority ()) + return 0; + } + return 1; +} + +// **************************************************************** + +TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void) +{ +} + +void +TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + // Obtain profile. + invocation->profile_ = invocation->stub_->profile_in_use (); + + // Select an endpoint from the profile. + + if (invocation->profile_->endpoint_count () == 0) + { + // Unknown protocol - move onto the next profile. + this->next (invocation, ACE_TRY_ENV); + ACE_CHECK; + this->select_endpoint (invocation, ACE_TRY_ENV); + } + + else + { + // Find the endpoint for the band of interest. + TAO_Endpoint *endpoint = 0; + for (TAO_Endpoint *endp = invocation->profile_->endpoint (); + endp != 0; + endp = endp->next ()) + { + if (endp->priority () + <= invocation->endpoint_selection_state_.max_priority_ + && endp->priority () + >= invocation->endpoint_selection_state_.min_priority_) + { + endpoint = endp; + break; + } + } + + if (endpoint != 0) + { + // Found an Endpoint with priority in the range of the band. + invocation->endpoint_ = endpoint; + } + else + { + // The profile didn't contain an endpoint with priority + // matching the band. + // There are two possibilities: + // a) we are talking to non-TAO server. + // b) we have misconfiguration - bands were set on the + // client and do not match server configuration. + // In both cases throw exception. (We are throwing + // exception for case 'a' because the current implementation of + // bands is not interoperable.) + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + CORBA::Policy::_duplicate (invocation-> + endpoint_selection_state_.bands_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + } +} + +// **************************************************************** + +TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void) +{ +} + +void +TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + /// Narrow down to the right policy. + RTCORBA::ClientProtocolPolicy_var cp_policy = + RTCORBA::ClientProtocolPolicy::_narrow ( + invocation->endpoint_selection_state_. + client_protocol_policy_, + ACE_TRY_ENV); + ACE_CHECK; + + /// Cast to TAO_ClientProtocolPolicy + TAO_ClientProtocolPolicy *client_protocol_policy = + ACE_static_cast (TAO_ClientProtocolPolicy *, + cp_policy.in ()); + + /// Get the ProtocolList + RTCORBA::ProtocolList & protocols = + client_protocol_policy->protocols_rep (); + + CORBA::ULong protocol_index = + invocation->endpoint_selection_state_.client_protocol_index_; + + if (protocols.length () == protocol_index) + // We have tried all the protocols specified in the client + // protocol policy with no success. Throw exception. + { + // Figure out proper exception. + if (!invocation->endpoint_selection_state_.valid_endpoint_found_) + { + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + CORBA::Policy::_duplicate (invocation-> + endpoint_selection_state_.client_protocol_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + else + // At least one satisfactory endpoint was found, but + // connection could not be established. + ACE_THROW (CORBA::COMM_FAILURE ()); + } + + // Find a Profile for the next protocol we would like to try. + TAO_Profile *profile = 0; + TAO_MProfile& mprofile = invocation->stub_->base_profiles (); + + for (TAO_PHandle i = 0; + i < mprofile.profile_count (); + ++i) + { + TAO_Profile *pf = mprofile.get_profile (i); + if (pf->tag () + == protocols[protocol_index].protocol_type) + { + profile = pf; + break; + } + } + + if (profile == 0 + || profile->endpoint_count () == 0) + { + // If either no profile for the protocol of interest were found + // or profile was found but client ORB doesn't understand the + // protocol, try another protocol. + invocation->endpoint_selection_state_.client_protocol_index_++; + this->select_endpoint (invocation, ACE_TRY_ENV); + } + else + { + // Found the profile - get the endpoint. + invocation->profile_ = profile; + this->endpoint (invocation, ACE_TRY_ENV); + } +} + +void +TAO_Protocol_Endpoint_Selector::endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment& /*ACE_TRY_ENV*/) +{ + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_ = invocation->profile_->endpoint (); +} + +void +TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_UNUSED_ARG (ACE_TRY_ENV); + + invocation->endpoint_selection_state_.client_protocol_index_++; + // If we ran out of profiles to try - this will be detected and + // exception thrown once <endpoint> is called. +} + +void +TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation + *invocation, + const TAO_MProfile& /* mprofile */, + CORBA::Environment &ACE_TRY_ENV) +{ + // Location forwarding is currently not supported when using + // RTCORBA::ClientProtocolPolicy. With the current profile + // management scheme being broken, it would be a pain to support here. + // @@ Add support for location forwarding once profile management is + // redesigned. + + // Currently location forward replies are ignored. When we receive + // a location forward reply, we act as if the profile we used + // didn't work, and we try the next one. Should we throw not + // supported exception instead? + this->next (invocation, ACE_TRY_ENV); +} + +void +TAO_Protocol_Endpoint_Selector::success (TAO_GIOP_Invocation *invocation) +{ + invocation->stub_->set_valid_profile (); +} + +void +TAO_Protocol_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation) +{ + invocation->endpoint_selection_state_.client_protocol_index_ = 0; +} + +// **************************************************************** + +TAO_Client_Priority_Policy_Selector::~TAO_Client_Priority_Policy_Selector (void) +{ +} + +void +TAO_Client_Priority_Policy_Selector::select_endpoint (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + TAO_MProfile& mprofile = invocation->stub_->base_profiles (); + invocation->endpoint_ = 0; + CORBA::ULong profile_index = + invocation->endpoint_selection_state_.client_protocol_index_; + + if (mprofile.profile_count () == profile_index) + // We have tried all the profiles with no success. Throw exception. + { + // Figure out proper exception. + if (!invocation->endpoint_selection_state_.valid_endpoint_found_) + { + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + invocation->stub_->get_client_policy + (TAO_CLIENT_PRIORITY_POLICY_TYPE, + ACE_TRY_ENV); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + else + // At least one satisfactory endpoint was found, but + // connection could not be established. + ACE_THROW (CORBA::COMM_FAILURE ()); + } + + CORBA::Short max = + invocation->endpoint_selection_state_.max_priority_; + CORBA::Short min = + invocation->endpoint_selection_state_.min_priority_; + + for (TAO_PHandle i = profile_index; + i < mprofile.profile_count (); + ++i) + { + TAO_Profile *profile = mprofile.get_profile (i); + + // Check if this profile contains any endpoints of the + // right priority. + for (TAO_Endpoint *endp = profile->endpoint (); + endp != 0; + endp = endp->next ()) + { + CORBA::Short priority = endp->priority (); + if (priority >= min && priority <= max) + { + invocation->profile_ = profile; + invocation->endpoint_ = endp; + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_selection_state_.client_protocol_index_ = i; + break; + } + } + + if (invocation->endpoint_ != 0) + break; + } + + // We were not able to find profile with the endpoint of the + // right priority. + if (invocation->endpoint_ == 0) + // Figure out proper exception. + if (!invocation->endpoint_selection_state_.valid_endpoint_found_) + { + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + invocation->stub_->get_client_policy + (TAO_CLIENT_PRIORITY_POLICY_TYPE, + ACE_TRY_ENV); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + else + // At least one satisfactory endpoint was found, but + // connection could not be established. + ACE_THROW (CORBA::COMM_FAILURE ()); +} + +void +TAO_Client_Priority_Policy_Selector::next (TAO_GIOP_Invocation + *invocation, + CORBA::Environment &ACE_TRY_ENV) +{ + ACE_UNUSED_ARG (ACE_TRY_ENV); + + invocation->endpoint_selection_state_.client_protocol_index_++; + // If we ran out of profiles to try - this will be detected and + // exception thrown once <endpoint> is called. +} + +void +TAO_Client_Priority_Policy_Selector::forward (TAO_GIOP_Invocation + *invocation, + const TAO_MProfile & /* mprofile */, + CORBA::Environment &ACE_TRY_ENV) +{ + // Location forwarding is not supported when using + // TAO::Client_Priority_Policy. Location forward replies are + // ignored. When we receive a location forward reply, we act as if + // the profile we used didn't work, and we try the next one. + this->next (invocation, ACE_TRY_ENV); +} + +void +TAO_Client_Priority_Policy_Selector::success (TAO_GIOP_Invocation *invocation) +{ + invocation->stub_->set_valid_profile (); +} + +void +TAO_Client_Priority_Policy_Selector::close_connection (TAO_GIOP_Invocation *invocation) +{ + invocation->endpoint_selection_state_.client_protocol_index_ = 0; +} + +// **************************************************************** + +TAO_Priority_Protocol_Selector::~TAO_Priority_Protocol_Selector (void) +{ +} + +void +TAO_Priority_Protocol_Selector::endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment + &ACE_TRY_ENV) +{ + if (invocation->profile_->endpoint_count () == 1) + { + // Profile contains just one endpoint. This happens when: + // a) we are talking to a nonTAO server (which doesn't have + // the concept of multiple endpoints per profile) + // or + // b) we have TAO server with a non-lane threadpool, in which + // case there is only one acceptor + // In both cases we should use the endpoint regardless of its priority. + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_ = invocation->profile_->endpoint (); + } + else + { + // Profiles contains more than one endpoint. Find one with the + // right priority. + TAO_Endpoint *endpoint = 0; + for (TAO_Endpoint *endp = invocation->profile_->endpoint (); + endp != 0; + endp = endp->next ()) + { + if (endp->priority () + == invocation->endpoint_selection_state_.client_priority_) + { + endpoint = endp; + break; + } + } + + if (endpoint != 0) + { + // Found an Endpoint with correct priority. + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_ = endpoint; + } + else + { + // The profile didn't contain an endpoint with matching priority. + // There are two possibilities: + // a) the server is a multi-homed host and this is the + // only reason for profile containing more than 1 + // endpoint, i.e., case a) above. + // b) we have misconfiguration - threadpool with lanes on + // the server, and client priority not matching any of + // the lanes. + if (this->is_multihomed (invocation->profile_->endpoint ())) + { + // case a + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_ = invocation->profile_->endpoint (); + } + else + // case b + { + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + CORBA::Policy::_duplicate (invocation-> + endpoint_selection_state_.priority_model_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + } + } +} + +int +TAO_Priority_Protocol_Selector::is_multihomed (TAO_Endpoint *endpoint) +{ + for (TAO_Endpoint *endp = endpoint; + endp != 0; + endp = endp->next ()) + { + if (endp->next () != 0 + && endp->priority () != endp->next ()->priority ()) + return 0; + } + return 1; +} + +// **************************************************************** + +TAO_Bands_Protocol_Selector::~TAO_Bands_Protocol_Selector (void) +{ +} + +void +TAO_Bands_Protocol_Selector::endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment + &ACE_TRY_ENV) +{ + // Find the endpoint for the band of interest. + TAO_Endpoint *endpoint = 0; + for (TAO_Endpoint *endp = invocation->profile_->endpoint (); + endp != 0; + endp = endp->next ()) + { + if (endp->priority () + <= invocation->endpoint_selection_state_.max_priority_ + && endp->priority () + >= invocation->endpoint_selection_state_.min_priority_) + { + endpoint = endp; + break; + } + } + + if (endpoint != 0) + { + // Found an Endpoint with priority in the range of the band. + invocation->endpoint_selection_state_.valid_endpoint_found_ = 1; + invocation->endpoint_ = endpoint; + } + else + { + // The profile didn't contain an endpoint with priority + // matching the band. + // There are two possibilities: + // a) we are talking to non-TAO server. + // b) we have misconfiguration - bands were set on the + // client and do not match server configuration. + // In both cases throw exception. (We are throwing + // exception for case 'a' because the current implementation of + // bands is not interoperable.) + if (invocation->inconsistent_policies_.ptr ()) + { + invocation->inconsistent_policies_->length (1); + invocation->inconsistent_policies_[0u] = + CORBA::Policy::_duplicate (invocation-> + endpoint_selection_state_.bands_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } +} + +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RT_Invocation_Endpoint_Selectors.h new file mode 100644 index 00000000000..2ea44fc9f85 --- /dev/null +++ b/TAO/tao/RT_Invocation_Endpoint_Selectors.h @@ -0,0 +1,225 @@ +// This may look like C, but it's really -*- C++ -*- +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// RT_Invocation_Endpoint_Selectors.h +// +// = DESCRIPTION +// Strategies for selecting profile/endpoint from an IOR for making an +// invocation. +// +// = AUTHOR +// Priyanka Gontla <pgontla@ece.uci.edu> +// +// ============================================================================ + +#ifndef TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H +#define TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H +#include "ace/pre.h" + +#include "tao/corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/MProfile.h" +#include "tao/Invocation_Endpoint_Selectors.h" + +#if (TAO_HAS_RT_CORBA == 1) + +class TAO_Export TAO_Priority_Endpoint_Selector : + public TAO_Default_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints based on the priority of the + // client thread making the invocation. + // + // = DESCRIPTION + // This strategy is used when RTCORBA::PriorityModelPolicy is + // set and its value is RTCORBA::CLIENT_PROPAGATED. + // +public: + TAO_Priority_Endpoint_Selector (void); + // Constructor. + + virtual ~TAO_Priority_Endpoint_Selector (void); + // Destructor. + + virtual void select_endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); +private: + int is_multihomed (TAO_Endpoint *endpoint); + // Helper for <select_endpoint>. +}; + +// **************************************************************** + +class TAO_Export TAO_Bands_Endpoint_Selector : + public TAO_Default_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints based on the priority range. + // + // = DESCRIPTION + // This strategy is used when + // RTCORBA::PriorityBandedConnectionPolicy is set. + // +public: + TAO_Bands_Endpoint_Selector (void); + // Constructor. + + virtual ~TAO_Bands_Endpoint_Selector (void); + // Destructor. + + virtual void select_endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); +}; + +// **************************************************************** + +class TAO_Export TAO_Protocol_Endpoint_Selector : + public TAO_Invocation_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints based on protocols. + // + // = DESCRIPTION + // This strategy is used when only RTCORBA::ClientProtocolPolicy is + // set or RTCORBA::ClientProtocolPolicy plus + // RTCORBA::SERVER_DECLARED priority model. + // +public: + TAO_Protocol_Endpoint_Selector (void); + // Constructor. + + virtual ~TAO_Protocol_Endpoint_Selector (void); + // Destructor. + + virtual void select_endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void next (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void forward (TAO_GIOP_Invocation *invocation, + const TAO_MProfile &mprofile, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void success (TAO_GIOP_Invocation *invocation); + virtual void close_connection (TAO_GIOP_Invocation *invocation); + +protected: + virtual void endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + // Helper for <select_endpoint>. +}; + +// **************************************************************** + +class TAO_Export TAO_Client_Priority_Policy_Selector : + public TAO_Invocation_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints when + // TAO::Client_Priority_Policy is set. + // + // = DESCRIPTION + // TAO::Client_Priority_Policy is deprecated. Similar (and + // beyond) functionality can be achieved through standard RTCORBA + // policies. See TAO Real-Time CORBA documentation for more + // information. + // +public: + TAO_Client_Priority_Policy_Selector (void); + // Constructor. + + virtual ~TAO_Client_Priority_Policy_Selector (void); + // Destructor. + + virtual void select_endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void next (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void forward (TAO_GIOP_Invocation *invocation, + const TAO_MProfile &mprofile, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + virtual void success (TAO_GIOP_Invocation *invocation); + virtual void close_connection (TAO_GIOP_Invocation *invocation); +}; + +// **************************************************************** + +class TAO_Export TAO_Priority_Protocol_Selector : + public TAO_Protocol_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints based on protocols and the + // priority of the client thread making the invocation. + // + // = DESCRIPTION + // This strategy is used when RTCORBA::ClientProtocolPolicy is + // set and the priority model is RTCORBA::CLIENT_PROPAGATED. + // +public: + TAO_Priority_Protocol_Selector (void); + // Constructor. + + virtual ~TAO_Priority_Protocol_Selector (void); + // Destructor. + +protected: + virtual void endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); + // + + int is_multihomed (TAO_Endpoint *endpoint); + // Helper for <select_endpoint>. +}; + +// **************************************************************** + +class TAO_Export TAO_Bands_Protocol_Selector : + public TAO_Protocol_Endpoint_Selector +{ + // = TITLE + // Strategy for selecting endpoints based on protocols and a + // priority range. + // + // = DESCRIPTION + // This strategy is used when both RTCORBA::ClientProtocolPolicy + // and RTCORBA::PriorityBandedConnectionPolicy are set. + // +public: + TAO_Bands_Protocol_Selector (void); + // Constructor. + + virtual ~TAO_Bands_Protocol_Selector (void); + // Destructor. + +protected: + virtual void endpoint (TAO_GIOP_Invocation *invocation, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment ()); +}; + +#endif /* TAO_HAS_RT_CORBA == 1 */ + +#if defined (__ACE_INLINE__) +# include "tao/RT_Invocation_Endpoint_Selectors.i" +#endif /* __ACE_INLINE__ */ + +#include "ace/post.h" +#endif /* TAO_RT_INVOCATION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/tao/RT_Invocation_Endpoint_Selectors.i b/TAO/tao/RT_Invocation_Endpoint_Selectors.i new file mode 100644 index 00000000000..9d703b560a2 --- /dev/null +++ b/TAO/tao/RT_Invocation_Endpoint_Selectors.i @@ -0,0 +1,42 @@ +// -*- C++ -*- +// $Id$ + +ACE_INLINE +TAO_Priority_Endpoint_Selector::TAO_Priority_Endpoint_Selector (void) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Bands_Endpoint_Selector::TAO_Bands_Endpoint_Selector (void) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Protocol_Endpoint_Selector::TAO_Protocol_Endpoint_Selector (void) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Client_Priority_Policy_Selector::TAO_Client_Priority_Policy_Selector (void) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Priority_Protocol_Selector::TAO_Priority_Protocol_Selector (void) +{ +} + +// **************************************************************** + +ACE_INLINE +TAO_Bands_Protocol_Selector::TAO_Bands_Protocol_Selector (void) +{ +} diff --git a/TAO/tao/RT_ORBInitializer.cpp b/TAO/tao/RT_ORBInitializer.cpp index bde192280f7..240d58ee0a1 100644 --- a/TAO/tao/RT_ORBInitializer.cpp +++ b/TAO/tao/RT_ORBInitializer.cpp @@ -10,7 +10,10 @@ ACE_RCSID (tao, RT_ORBInitializer, "$Id$") #include "tao/RT_PolicyFactory.h" #include "tao/RTCORBAC.h" +#include "tao/RT_Policy_i.h" +#include "tao/RT_Protocols_Hooks.h" #include "tao/Exception.h" +#include "tao/ORB_Core.h" void TAO_RT_ORBInitializer::pre_init ( @@ -18,6 +21,16 @@ TAO_RT_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + // Sets the name of the Protocol_Hooks to be the RT_Protocols_Hooks. + TAO_ORB_Core::set_protocols_hooks ("RT_Protocols_Hooks"); + + // Sets the client_protocol policy. + TAO_RT_Protocols_Hooks::set_client_protocols_hook + (TAO_ClientProtocolPolicy::hook); + + // Sets the server_protocol policy. + TAO_RT_Protocols_Hooks::set_server_protocols_hook + (TAO_ServerProtocolPolicy::hook); } void diff --git a/TAO/tao/RT_Policy_i.cpp b/TAO/tao/RT_Policy_i.cpp index a3336c16736..42e7b951d57 100644 --- a/TAO/tao/RT_Policy_i.cpp +++ b/TAO/tao/RT_Policy_i.cpp @@ -2,6 +2,7 @@ #include "tao/RT_Policy_i.h" +#include "tao/ORB_Core.h" #if ! defined (__ACE_INLINE__) #include "tao/RT_Policy_i.i" @@ -595,6 +596,121 @@ TAO_ServerProtocolPolicy::destroy (CORBA::Environment &) { } +int +TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var + &properties, + const char *protocol_type) +{ + // ServerProtocolProperties policy controls protocols configuration. + // Look for protocol properties in the effective ServerProtocolPolicy. + CORBA::Policy_var policy = + orb_core->server_protocol (); + + ACE_DECLARE_NEW_CORBA_ENV; + + RTCORBA::ServerProtocolPolicy_var server_protocols_policy; + TAO_ServerProtocolPolicy *server_protocols = 0; + + if (!CORBA::is_nil (policy.in ())) + { + server_protocols_policy = + RTCORBA::ServerProtocolPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + server_protocols = + ACE_static_cast (TAO_ServerProtocolPolicy *, + server_protocols_policy.in ()); + + if (server_protocols != 0) + { + RTCORBA::ProtocolList & protocols = server_protocols->protocols_rep (); + + // Find protocol properties. + for (CORBA::ULong j = 0; j < protocols.length (); ++j) + { + if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, + "iiop") == 0) + break; + } + else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "uiop") == 0) + break; + } + } + } + } + + if (CORBA::is_nil (properties.in ())) + { + // TCP/UIOP/SHMIOP Properties were not specified in the effective policy. + // We must use orb defaults. + policy = orb_core->default_server_protocol (); + + if (!CORBA::is_nil (policy.in ())) + { + server_protocols_policy = + RTCORBA::ServerProtocolPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + server_protocols = + ACE_static_cast (TAO_ServerProtocolPolicy *, + server_protocols_policy.in ()); + + if (!CORBA::is_nil (server_protocols)) + { + // Find protocol properties for IIOP. + RTCORBA::ProtocolList & protocols = + server_protocols->protocols_rep (); + + for (CORBA::ULong j = 0; j < protocols.length (); ++j) + { + if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "iiop") == 0) + break; + } + else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "uiop") == 0) + break; + } + } + } + } + } + return 0; +} + // **************************************************************** TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const @@ -657,6 +773,121 @@ TAO_ClientProtocolPolicy::destroy (CORBA::Environment &) { } +int +TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var + &properties, + const char *protocol_type) +{ + // Check ORB-level override for properties. + CORBA::Policy_var policy = + orb_core->policy_manager ()->client_protocol (); + + ACE_DECLARE_NEW_CORBA_ENV; + + RTCORBA::ClientProtocolPolicy_var client_protocols_policy; + TAO_ClientProtocolPolicy *client_protocols = 0; + + if (!CORBA::is_nil (policy.in ())) + { + client_protocols_policy = + RTCORBA::ClientProtocolPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + client_protocols = + ACE_static_cast (TAO_ClientProtocolPolicy *, + client_protocols_policy.in ()); + + if (client_protocols != 0) + { + //TAO_ClientProtocolPolicy + RTCORBA::ProtocolList & protocols = + client_protocols->protocols_rep (); + + for (CORBA::ULong j = 0; j < protocols.length (); ++j) + { + if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "iiop") == 0) + break; + } + else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "uiop") == 0) + break; + } + } + } + } + + if (CORBA::is_nil (properties.in ())) + { + // No tcp/uiop properties in ORB-level override. Use ORB defaults. + // Orb defaults should never be null - they were initialized by + // the ORB_Core. + policy = + orb_core->default_client_protocol (); + + if (!CORBA::is_nil (policy.in ())) + { + client_protocols_policy = + RTCORBA::ClientProtocolPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + client_protocols = + ACE_dynamic_cast (TAO_ClientProtocolPolicy *, + client_protocols_policy.in ()); + + if (client_protocols != 0) + { + RTCORBA::ProtocolList & protocols = + client_protocols->protocols_rep (); + + for (CORBA::ULong j = 0; j < protocols.length (); ++j) + { + if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "iiop") == 0) + break; + } + else if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) + { + properties = + RTCORBA::ProtocolProperties::_narrow ( + protocols[j].transport_protocol_properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (ACE_OS::strcmp (protocol_type, "uiop") == 0) + break; + } + } + } + } + } + return 0; +} + /////////////////////////////////////////////////////// // Method for serialization support. diff --git a/TAO/tao/RT_Policy_i.h b/TAO/tao/RT_Policy_i.h index fbfc2982a11..02e68038478 100644 --- a/TAO/tao/RT_Policy_i.h +++ b/TAO/tao/RT_Policy_i.h @@ -23,6 +23,7 @@ #if (TAO_HAS_RT_CORBA == 1) #include "tao/RTCORBAS.h" +#include "tao/RTCORBAC.h" #include "tao/LocalObject.h" #include "ace/SString.h" @@ -306,6 +307,9 @@ public: TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); + static int hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var &properties, + const char *protocol_type); private: /// Attribute. @@ -355,6 +359,10 @@ public: TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); + static int hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var &properties, + const char* protocol_type); + virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tao/RT_Protocols_Hooks.cpp b/TAO/tao/RT_Protocols_Hooks.cpp new file mode 100644 index 00000000000..6eab2c0361b --- /dev/null +++ b/TAO/tao/RT_Protocols_Hooks.cpp @@ -0,0 +1,414 @@ +// $Id$ + +#include "RT_Protocols_Hooks.h" +#include "RT_Policy_i.h" + +#include "tao/Invocation.h" +#include "tao/Stub.h" +#include "tao/MProfile.h" + +#include "ace/Dynamic_Service.h" + +ACE_RCSID(tao, RT_Protocols_Hooks, "$Id$"); + +TAO_RT_Protocols_Hooks::Client_Protocols_Hook TAO_RT_Protocols_Hooks::client_protocols_hook_ = 0; +TAO_RT_Protocols_Hooks::Server_Protocols_Hook TAO_RT_Protocols_Hooks::server_protocols_hook_ = 0; + +/// constructor +TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void) +{ +} + +/// destructor +TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void) +{ +} + +int +TAO_RT_Protocols_Hooks::call_client_protocols_hook ( + TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type) +{ + if (TAO_RT_Protocols_Hooks::client_protocols_hook_ == 0) + return -1; + + (*TAO_RT_Protocols_Hooks::client_protocols_hook_) (orb_core, + properties, + protocol_type); + + return 0; +} + +void +TAO_RT_Protocols_Hooks::set_client_protocols_hook (Client_Protocols_Hook hook) +{ + TAO_RT_Protocols_Hooks::client_protocols_hook_ = hook; + // Saving the hook pointer so that we can use it later when needed. + + return; +} + +int +TAO_RT_Protocols_Hooks::call_server_protocols_hook ( + TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type) +{ + if (TAO_RT_Protocols_Hooks::server_protocols_hook_ == 0) + return -1; + + int result_value = + (*TAO_RT_Protocols_Hooks::server_protocols_hook_) (orb_core, + properties, + protocol_type); + + if (result_value != 0) + return -1; + + return 0; +} + +void +TAO_RT_Protocols_Hooks::set_server_protocols_hook (Server_Protocols_Hook hook) +{ + TAO_RT_Protocols_Hooks::server_protocols_hook_ = hook; + // Saving the hook pointer so that we can use it later when needed. + + return; +} + +void +TAO_RT_Protocols_Hooks::call_policy_type_hook (CORBA::PolicyList *&policy_list, + CORBA::ULong &policy_type) +{ + CORBA::ULong length = policy_list->length (); + // CORBA::ULong index = 0; + + for (unsigned int i = 0; i < length; ++i) + { + if (((*policy_list)[i]->policy_type () == + RTCORBA::PRIORITY_MODEL_POLICY_TYPE)) + policy_type = 0; + + else if (((*policy_list)[i]->policy_type () == + RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)) + policy_type = 1; + + else if (((*policy_list)[i]->policy_type () == + RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)) + policy_type = 2; + } +} + +void +TAO_RT_Protocols_Hooks::validate_policy_type (CORBA::ULong type, + CORBA::ULong &type_value, + CORBA::Environment &ACE_TRY_ENV) +{ + // Validity check. Make sure requested policy type is appropriate + // for this scope. + if (type == RTCORBA::THREADPOOL_POLICY_TYPE + || type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE) + ACE_THROW (CORBA::INV_POLICY ()); + + if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) + type_value = 0; + + if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) + type_value = 1; + + if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) + type_value = 2; +} + +CORBA::Policy * +TAO_RT_Protocols_Hooks::effective_priority_banded_connection_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &ACE_TRY_ENV) +{ + RTCORBA::PriorityBandedConnectionPolicy_var override_policy_ptr = + RTCORBA::PriorityBandedConnectionPolicy::_narrow (override, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + TAO_PriorityBandedConnectionPolicy *override_policy = + ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, + override_policy_ptr.in ()); + + RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_ptr = + RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + TAO_PriorityBandedConnectionPolicy *exposed_policy = + ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, + exposed_policy_ptr.in ()); + + // Both override and exposed have been set. + // See if either of them has empty priority bands. + CORBA::Object_var auto_release_exp = exposed_policy; + CORBA::Object_var auto_release_ov = override_policy; + + if (exposed_policy->priority_bands_rep ().length () == 0) + { + auto_release_ov._retn (); + return override; + } + + if (override_policy->priority_bands_rep ().length () == 0) + { + auto_release_exp._retn (); + return exposed; + } + + // Both override and exposed have been set and neither has empty + // priority bands. This is illegal (ptc/99-05-03, sec. 4.12.1). + ACE_THROW_RETURN (CORBA::INV_POLICY (), + 0); +} + +CORBA::Policy * +TAO_RT_Protocols_Hooks::effective_client_protocol_hook ( + CORBA::Policy_ptr override, + CORBA::Policy_ptr exposed, + CORBA::Environment &ACE_TRY_ENV) +{ + RTCORBA::ClientProtocolPolicy_var override_policy_var = + RTCORBA::ClientProtocolPolicy::_narrow (override, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + TAO_ClientProtocolPolicy *override_policy = + ACE_static_cast (TAO_ClientProtocolPolicy *, + override_policy_var.in ()); + + RTCORBA::ClientProtocolPolicy_var exposed_policy_var = + RTCORBA::ClientProtocolPolicy::_narrow (exposed, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + TAO_ClientProtocolPolicy *exposed_policy = + ACE_static_cast (TAO_ClientProtocolPolicy *, + exposed_policy_var.in ()); + + // Both override and exposed have been set. + // See if either of them has empty priority bands. + RTCORBA::ProtocolList &protocols_rep_var = + exposed_policy->protocols_rep (); + + if (protocols_rep_var.length () == 0) + { + return override; + } + + if (override_policy->protocols_rep ().length () == 0) + { + return exposed; + } + + // Both override and exposed have been set and neither has empty + // protocols. This is illegal (ptc/99-05-03, sec. 4.15.4). + ACE_THROW_RETURN (CORBA::INV_POLICY (), + 0); +} + +void +TAO_RT_Protocols_Hooks::add_rt_service_context_hook ( + TAO_GIOP_Invocation *invocation, + CORBA::Policy *model_policy, + CORBA::Short &client_priority, + CORBA::Environment &ACE_TRY_ENV) +{ + + RTCORBA::PriorityModelPolicy_var model_policy_ptr = + RTCORBA::PriorityModelPolicy::_narrow (model_policy, + ACE_TRY_ENV); + ACE_CHECK; + + TAO_PriorityModelPolicy *priority_model = + ACE_static_cast (TAO_PriorityModelPolicy *, + model_policy_ptr.in ()); + + if (priority_model->get_priority_model () == RTCORBA::CLIENT_PROPAGATED) + { + // Encapsulate the priority of the current thread into + // a service context. + TAO_OutputCDR cdr; + if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) + == 0) + || (cdr << client_priority) + == 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 = invocation->service_info (); + + CORBA::ULong l = context_list.length (); + context_list.length (l + 1); + context_list[l].context_id = IOP::RTCorbaPriority; + + // Make a *copy* of the CDR stream... + CORBA::ULong length = cdr.total_length (); + context_list[l].context_data.length (length); + CORBA::Octet *buf = context_list[l].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_RT_Protocols_Hooks::get_selector_hook ( + CORBA::Policy *model_policy, + CORBA::Boolean &is_client_propagated, + CORBA::Short &server_priority) +{ + + RTCORBA::PriorityModelPolicy_var model_policy_ptr = + RTCORBA::PriorityModelPolicy::_narrow (model_policy); + + TAO_PriorityModelPolicy *priority_model_policy = + ACE_static_cast (TAO_PriorityModelPolicy *, + model_policy_ptr.in ()); + + if (priority_model_policy->get_priority_model () + == RTCORBA::CLIENT_PROPAGATED) + is_client_propagated = 1; + + if (!is_client_propagated) + server_priority = priority_model_policy->server_priority (); + + return; +} + +void +TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( + CORBA::Policy *bands_policy, + CORBA::Short &min_priority, + CORBA::Short &max_priority, + CORBA::Short &p, + int &in_range) +{ + RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr = + RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands_policy); + + TAO_PriorityBandedConnectionPolicy *priority_bands_policy = + ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, + bands_policy_ptr.in ()); + + // Find the band with the range covering our target priority. + RTCORBA::PriorityBands &bands = + priority_bands_policy->priority_bands_rep (); + + for (CORBA::ULong i = 0; i < bands.length (); ++i) + if (bands[i].low <= p && bands[i].high >= p) + { + min_priority = bands[i].low; + max_priority = bands[i].high; + + in_range = 1; + break; + } + return; +} + +void +TAO_RT_Protocols_Hooks::select_endpoint_hook ( + TAO_GIOP_Invocation *invocation, + CORBA::Policy *client_protocol_policy, + TAO_Profile *& profile, + CORBA::Environment &ACE_TRY_ENV) +{ + RTCORBA::ClientProtocolPolicy_var cp_policy = + RTCORBA::ClientProtocolPolicy::_narrow (client_protocol_policy, + ACE_TRY_ENV); + ACE_CHECK; + + TAO_ClientProtocolPolicy *client_protocol = + ACE_static_cast (TAO_ClientProtocolPolicy *, + cp_policy.in ()); + + RTCORBA::ProtocolList & protocols = + client_protocol->protocols_rep (); + + CORBA::ULong protocol_index = + invocation->get_endpoint_selection_state ().client_protocol_index_; + + if (protocols.length () == protocol_index) + // We have tried all the protocols specified in the client + // protocol policy with no success. Throw exception. + { + // Figure out proper exception. + if (!invocation->get_endpoint_selection_state ().valid_endpoint_found_) + { + if (invocation->get_inconsistent_policies ()) + { + invocation->get_inconsistent_policies ()->length (1); + CORBA::PolicyList_var inconsistent_policies = + invocation->get_inconsistent_policies (); + inconsistent_policies [0u] = + CORBA::Policy::_duplicate (invocation-> + get_endpoint_selection_state ().client_protocol_policy_); + } + ACE_THROW (CORBA::INV_POLICY ()); + } + else + // At least one satisfactory endpoint was found, but + // connection could not be established. + ACE_THROW (CORBA::COMM_FAILURE ()); + } + + // Find a Profile for the next protocol we would like to try. + TAO_MProfile& mprofile = invocation->get_stub ()->base_profiles (); + + for (TAO_PHandle i = 0; + i < mprofile.profile_count (); + ++i) + { + TAO_Profile *pf = mprofile.get_profile (i); + if (pf->tag () + == protocols[protocol_index].protocol_type) + { + profile = pf; + break; + } + } + + return; +} + +ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks, + ACE_TEXT ("RT_Protocols_Hooks"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_RT_Protocols_Hooks), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_FACTORY_DEFINE (TAO, TAO_RT_Protocols_Hooks) + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#pragma instantiate ACE_Dynamic_Service<TAO_RT_Protocols_Hooks> + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/RT_Protocols_Hooks.h b/TAO/tao/RT_Protocols_Hooks.h new file mode 100644 index 00000000000..97635e10d46 --- /dev/null +++ b/TAO/tao/RT_Protocols_Hooks.h @@ -0,0 +1,138 @@ +// -*- C++ -*- + +// =================================================================== +/** + * @file RT_Protocols_Hooks.h + * + * $Id$ + * + * @author Priyanka Gontla <pgontla@ece.uci.edu> + * + */ +// =================================================================== + +#ifndef TAO_RT_PROTOCOLS_HOOKS_H +#define TAO_RT_PROTOCOLS_HOOKS_H +#include "ace/pre.h" + +#include "Protocols_Hooks.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks +{ +public: + + /// constructor + TAO_RT_Protocols_Hooks (void); + + /// destructor + virtual ~TAO_RT_Protocols_Hooks (void); + + /// Invoke the client_protocols hook if present. + /** + * The timeout hook is used to determine if the client_protocols policy is + * set and with what value. If the ORB is compiled without support + * for RTCORBA this feature does not take effect + * \param tcp_properties returns the Protocol List set + */ + + virtual int call_client_protocols_hook ( + TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var &properties, + const char *protocol_type); + + /// Define the Client_Protocols_TCP_Hook signature + typedef int (*Client_Protocols_Hook) (TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *); + + static void set_client_protocols_hook (Client_Protocols_Hook hook); + + // static void set_client_protocols_uiop_hook (Client_Protocols_UIOP_Hook hook); + + /// The hook to be set for the ClientProtocolPolicy. + static Client_Protocols_Hook client_protocols_hook_; + + /// Invoke the server_protocols hook if present. + /** + * The timeout hook is used to determine if the client_protocols policy is + * set and with what value. If the ORB is compiled without support + * for RTCORBA this feature does not take effect + * \param tcp_properties returns the Protocol List set + */ + virtual int call_server_protocols_hook (TAO_ORB_Core *orb_core, + RTCORBA::ProtocolProperties_var & + properties, + const char *protocol_type); + + /// Define the Server_Protocols_Hook signature + typedef int (*Server_Protocols_Hook) (TAO_ORB_Core *, + RTCORBA::ProtocolProperties_var &, + const char *); + + static void set_server_protocols_hook (Server_Protocols_Hook hook); + // static void set_server_protocols_uiop_hook (Server_Protocols_UIOP_Hook hook); + + /// The hook to be set for the ServerProtocolPolicy. + static Server_Protocols_Hook server_protocols_hook_; + + /** + * to get the policy_type in Long format. + * + */ + virtual void call_policy_type_hook (CORBA::PolicyList *&policy_list, + CORBA::ULong &policy_type); + + virtual void validate_policy_type (CORBA::ULong slot, + CORBA::ULong &type_value, + CORBA::Environment &ACE_TRY_ENV); + + virtual void add_rt_service_context_hook ( + TAO_GIOP_Invocation *invocation, + CORBA::Policy *model_policy, + CORBA::Short &client_priority, + CORBA::Environment &ACE_TRY_ENV); + + virtual void get_selector_hook (CORBA::Policy *model_policy, + CORBA::Boolean + &is_client_propagated, + CORBA::Short &server_priority); + + virtual void get_selector_bands_policy_hook ( + CORBA::Policy *bands_policy, + CORBA::Short &min_priority, + CORBA::Short &max_priority, + CORBA::Short &p, + int &in_range); + + virtual void select_endpoint_hook (TAO_GIOP_Invocation *invocation, + CORBA::Policy *client_protocol_policy, + TAO_Profile *&profile, + CORBA::Environment &ACE_TRY_ENV); + + /** + * Hook to check and override the exposed policies if needed + * + */ + virtual CORBA::Policy *effective_priority_banded_connection_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); + + virtual CORBA::Policy *effective_client_protocol_hook (CORBA::Policy *override, + CORBA::Policy *exposed, + CORBA::Environment &); +}; + +#if defined (__ACE_INLINE__) +#include "RT_Protocols_Hooks.i" +#endif /* __ACE_INLINE__ */ + +ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_RT_Protocols_Hooks) +ACE_FACTORY_DECLARE (TAO, TAO_RT_Protocols_Hooks) +ACE_STATIC_SVC_REQUIRE(TAO_RT_Protocols_Hooks) + +#include "ace/post.h" +#endif /* TAO_RT_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/RT_Protocols_Hooks.i b/TAO/tao/RT_Protocols_Hooks.i new file mode 100644 index 00000000000..cfa1da318d3 --- /dev/null +++ b/TAO/tao/RT_Protocols_Hooks.i @@ -0,0 +1 @@ +// $Id$ diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile index ce9f38ae368..31eaf7dda6d 100644 --- a/TAO/tao/SmartProxies/Makefile +++ b/TAO/tao/SmartProxies/Makefile @@ -51,8 +51,6 @@ 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/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/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 081f4811aea..f70319b2dd8 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -86,8 +86,6 @@ 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 \ @@ -184,8 +182,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - strategies_export.h \ + $(ACE_ROOT)/ace/Service_Object.i strategies_export.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -202,8 +199,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 \ - UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.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 \ @@ -382,6 +379,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -403,8 +420,6 @@ CPPFLAGS += -I$(TAO_ROOT) .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/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 +536,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 \ - UIOP_Acceptor.h $(TAO_ROOT)/tao/Pluggable.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.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 \ @@ -701,6 +716,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -729,8 +764,6 @@ 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 \ @@ -861,8 +894,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/Profile.i \ - strategies_export.h \ + $(TAO_ROOT)/tao/Profile.i strategies_export.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ UIOP_Connection_Handler.h UIOP_Transport.h \ @@ -1032,6 +1064,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/debug.h uiop_endpoints.h \ uiop_endpoints.i @@ -1041,8 +1093,6 @@ 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 \ @@ -1214,8 +1264,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - strategies_export.h \ + $(TAO_ROOT)/tao/Pluggable.i strategies_export.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1253,8 +1302,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Acceptor.h \ + UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ @@ -1289,8 +1337,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \ + $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \ + UIOP_Endpoint.i UIOP_Profile.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ @@ -1361,6 +1409,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1390,8 +1456,6 @@ 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 \ @@ -1610,8 +1674,8 @@ CPPFLAGS += -I$(TAO_ROOT) UIOP_Connection_Handler.h UIOP_Transport.h strategies_export.h \ $(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 \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i 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 \ @@ -1629,8 +1693,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocol_Factory.h \ $(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 \ + $(TAO_ROOT)/tao/Connector_Impl.cpp 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 \ @@ -1651,8 +1715,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \ + $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \ + UIOP_Endpoint.i UIOP_Profile.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ @@ -1703,10 +1767,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAS.h \ $(TAO_ROOT)/tao/IOPS.h \ @@ -1726,6 +1786,11 @@ 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/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ $(TAO_ROOT)/tao/Base_Connection_Property.inl @@ -1734,8 +1799,6 @@ 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 \ @@ -2030,26 +2093,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(TAO_ROOT)/tao/ORB_Table.h \ - $(TAO_ROOT)/tao/ORB_Table.inl \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Connector_Registry.h \ - $(TAO_ROOT)/tao/Connector_Registry.i \ - $(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 \ - $(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/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/RT_Policy_i.h \ $(TAO_ROOT)/tao/RTCORBAS.h \ $(TAO_ROOT)/tao/IOPS.h \ @@ -2068,16 +2111,34 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAS_T.i \ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ $(TAO_ROOT)/tao/RTCORBAS.i \ - $(TAO_ROOT)/tao/RT_Policy_i.i + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/ORB_Table.h \ + $(TAO_ROOT)/tao/ORB_Table.inl \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Connector_Registry.h \ + $(TAO_ROOT)/tao/Connector_Registry.i \ + $(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 \ + $(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/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i UIOP_Endpoint.h \ + UIOP_Endpoint.i UIOP_Profile.i \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.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_Transport.h \ - $(TAO_ROOT)/tao/Pluggable.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 \ @@ -2249,8 +2310,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - strategies_export.h \ + $(TAO_ROOT)/tao/Pluggable.i strategies_export.h \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -2369,6 +2429,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -2394,8 +2474,6 @@ 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 \ @@ -2489,8 +2567,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(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 \ + $(TAO_ROOT)/tao/Endpoint.i 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 \ @@ -2626,8 +2704,6 @@ 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 \ @@ -2725,8 +2801,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - strategies_export.h \ + $(ACE_ROOT)/ace/Service_Object.i strategies_export.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -2743,8 +2818,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 \ - SHMIOP_Acceptor.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h SHMIOP_Acceptor.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -2804,8 +2878,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/Acceptor.h \ + SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -2922,6 +2995,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -2951,14 +3044,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_Connector.i \ $(TAO_ROOT)/tao/Connector_Impl.h \ $(TAO_ROOT)/tao/Connector_Impl.inl \ - $(TAO_ROOT)/tao/Connector_Impl.cpp + $(TAO_ROOT)/tao/Connector_Impl.cpp \ + $(ACE_ROOT)/ace/Arg_Shifter.h .obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.so .shobj/SHMIOP_Profile.o .shobj/SHMIOP_Profile.so: SHMIOP_Profile.cpp SHMIOP_Profile.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 \ @@ -3051,8 +3143,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 \ - strategies_export.h \ + $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/IOPC.h \ @@ -3093,8 +3184,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h \ + $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -3224,6 +3314,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/iiop_endpoints.h \ @@ -3233,8 +3343,6 @@ 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 \ @@ -3327,8 +3435,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 \ - strategies_export.h \ + $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ @@ -3443,9 +3550,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/Acceptor.h \ + $(TAO_ROOT)/tao/Pluggable.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -3480,8 +3586,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(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 \ + $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -3489,8 +3595,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i \ $(ACE_ROOT)/ace/MEM_Addr.h \ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \ - SHMIOP_Profile.i \ - $(TAO_ROOT)/tao/Timeprobe.h \ + SHMIOP_Profile.i $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ $(TAO_ROOT)/tao/Sync_Strategies.h \ @@ -3554,6 +3659,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -3582,8 +3705,6 @@ 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 \ @@ -3808,8 +3929,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/Acceptor.h \ + SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Wait_Strategy.h \ $(TAO_ROOT)/tao/Connection_Handler.h \ @@ -3850,8 +3970,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(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 \ + $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -3903,6 +4023,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -3913,8 +4053,6 @@ 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 \ @@ -4088,8 +4226,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/Acceptor.h \ + SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ @@ -4208,6 +4345,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORB_Table.h \ $(TAO_ROOT)/tao/ORB_Table.inl \ @@ -4236,18 +4393,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Components.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - SHMIOP_Endpoint.h SHMIOP_Endpoint.i SHMIOP_Profile.i \ + $(TAO_ROOT)/tao/Object_KeyC.i SHMIOP_Endpoint.h \ + SHMIOP_Endpoint.i SHMIOP_Profile.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/MProfile.i .obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \ - SHMIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ + SHMIOP_Connection_Handler.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 \ @@ -4469,8 +4623,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(TAO_ROOT)/tao/Pluggable.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/debug.h \ @@ -4540,6 +4694,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Messaging_Policy_i.h \ $(TAO_ROOT)/tao/Messaging_Policy_i.i \ @@ -4576,8 +4750,6 @@ 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 \ @@ -4671,8 +4843,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Endpoint.i \ - strategies_export.h $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Endpoint.i strategies_export.h \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -4713,8 +4885,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Reactor.h \ + SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ @@ -4818,16 +4989,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(TAO_ROOT)/tao/Pluggable.i SHMIOP_Transport.i \ + SHMIOP_Connection_Handler.inl \ $(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_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 \ @@ -4920,8 +5089,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 \ - strategies_export.h \ + $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -4951,8 +5119,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - advanced_resource.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp advanced_resource.h \ $(TAO_ROOT)/tao/default_resource.h \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ @@ -5079,8 +5246,28 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i \ - advanced_resource.i UIOP_Factory.h SHMIOP_Factory.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i advanced_resource.i \ + UIOP_Factory.h SHMIOP_Factory.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.i @@ -5088,8 +5275,6 @@ 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 \ @@ -5182,8 +5367,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 \ - strategies_export.h \ + $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5213,8 +5397,6 @@ CPPFLAGS += -I$(TAO_ROOT) .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/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 \ @@ -5466,19 +5648,35 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/ORB_Core.i \ - advanced_resource.i UIOP_Factory.h SHMIOP_Factory.h \ - Reactor_Per_Priority.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(TAO_ROOT)/tao/ORB_Core.i advanced_resource.i \ + UIOP_Factory.h SHMIOP_Factory.h Reactor_Per_Priority.h \ $(TAO_ROOT)/tao/Reactor_Registry.h \ $(TAO_ROOT)/tao/Reactor_Registry.i \ Reactor_Per_Priority.i Direct_Priority_Mapping.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/Priority_Mapping.i \ Direct_Priority_Mapping.i Linear_Priority_Mapping.h \ - Linear_Priority_Mapping.i \ - $(TAO_ROOT)/tao/debug.h \ + Linear_Priority_Mapping.i $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Single_Reactor.h \ $(TAO_ROOT)/tao/Single_Reactor.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -5513,8 +5711,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -5609,8 +5805,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Reactor_Registry.i \ - strategies_export.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ + strategies_export.h $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -5634,8 +5829,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Reactor_Per_Priority.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + Reactor_Per_Priority.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ @@ -5765,6 +5959,26 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAS.h \ + $(TAO_ROOT)/tao/IOPS.h \ + $(TAO_ROOT)/tao/IOPS_T.h \ + $(TAO_ROOT)/tao/IOPS_T.i \ + $(TAO_ROOT)/tao/IOPS_T.cpp \ + $(TAO_ROOT)/tao/IOPS.i \ + $(TAO_ROOT)/tao/TimeBaseS.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.h \ + $(TAO_ROOT)/tao/TimeBaseS_T.i \ + $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ + $(TAO_ROOT)/tao/TimeBaseS.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.h \ + $(TAO_ROOT)/tao/RTCORBAS_T.i \ + $(TAO_ROOT)/tao/RTCORBAS_T.cpp \ + $(TAO_ROOT)/tao/RTCORBAS.i \ + $(TAO_ROOT)/tao/RT_Policy_i.i \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Leader_Follower.h \ $(TAO_ROOT)/tao/Leader_Follower.i \ @@ -5774,8 +5988,6 @@ 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 \ @@ -5917,8 +6129,6 @@ 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 \ diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index d20852445bb..cd66de81264 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -27,11 +27,11 @@ #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" +#include "tao/Protocols_Hooks.h" #include "tao/RT_Policy_i.h" ACE_RCSID(Strategies, UIOP_Acceptor, "$Id$") - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; @@ -541,52 +541,33 @@ TAO_UIOP_Acceptor::init_uiop_properties (void) // ServerProtocol policy first. // ServerProtocolProperties policy controls protocols configuration. - // Look for protocol properties in the effective ServerProtocolPolicy. - TAO_ServerProtocolPolicy *server_protocols = - this->orb_core_->server_protocol (); - // Automatically release the policy. - CORBA::Object_var auto_release = server_protocols; - RTCORBA::UnixDomainProtocolProperties_var uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_nil (); - RTCORBA::ProtocolList & protocols = server_protocols->protocols_rep (); - - // Find protocol properties for UIOP. + // Look for protocol properties in the effective + // ServerProtocolPolicy. ACE_DECLARE_NEW_CORBA_ENV; - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) - { - uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - if (CORBA::is_nil (uiop_properties.in ())) + RTCORBA::ProtocolProperties_var properties = + RTCORBA::ProtocolProperties::_nil (); + + TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (); + + if (tph != 0) { - // TCP Properties were not specified in the effective policy. - // We must use orb defaults. - - server_protocols = this->orb_core_->default_server_protocol (); - // Automatically release the policy. - auto_release = server_protocols; - // Find protocol properties for IIOP. - RTCORBA::ProtocolList & protocols = server_protocols->protocols_rep (); - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) - { - uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - - // Orb defaults should never be null, since the ORB initializes - // them in ORB_init ... + const char protocol [] = "uiop"; + const char *protocol_type = protocol; + + int hook_result = + tph->call_server_protocols_hook (this->orb_core_, + properties, + protocol_type); + + if(hook_result == -1) + return -1; } + + RTCORBA::UnixDomainProtocolProperties_var uiop_properties = + RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); // Extract and locally store properties of interest. this->uiop_properties_.send_buffer_size = diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index e4964e26884..52a5d171463 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -11,12 +11,11 @@ #include "tao/ORB_Core.h" #include "tao/Environment.h" #include "ace/Auto_Ptr.h" -#include "tao/RT_Policy_i.h" +#include "tao/Protocols_Hooks.h" #include "tao/Base_Connection_Property.h" ACE_RCSID(Strategies, UIOP_Connector, "$Id$") - TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_UIOP_PROFILE), connect_strategy_ (), @@ -421,54 +420,37 @@ TAO_UIOP_Connector::init_uiop_properties (void) ACE_DECLARE_NEW_CORBA_ENV; - // Check ORB-level override for tcp properties. - TAO_ClientProtocolPolicy *client_protocols = - this->orb_core ()->policy_manager ()->client_protocol (); - CORBA::Object_var auto_release = client_protocols; - RTCORBA::UnixDomainProtocolProperties_var uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_nil (); + RTCORBA::ProtocolProperties_var properties = + RTCORBA::ProtocolProperties::_nil (); - if (client_protocols != 0) - { - RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep (); - - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) - { - uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } - } + TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); - if (CORBA::is_nil (uiop_properties.in ())) + if (tph != 0) { - // No tcp properties in ORB-level override. Use ORB defaults. - // Orb defaults should never be null - they were initialized by - // the ORB_Core. - client_protocols = this->orb_core ()->default_client_protocol (); - auto_release = client_protocols; - RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep (); - for (CORBA::ULong j = 0; j < protocols.length (); ++j) - if (protocols[j].protocol_type == TAO_TAG_UIOP_PROFILE) - { - uiop_properties = - RTCORBA::UnixDomainProtocolProperties::_narrow - (protocols[j].transport_protocol_properties.in (), - ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - break; - } + const char protocol [] = "uiop"; + const char *protocol_type = protocol; + int hook_result = + tph->call_client_protocols_hook (this->orb_core (), + properties, + protocol_type); + + if(hook_result == -1) + return -1; } - // Extract and locally store properties of interest. - this->uiop_properties_.send_buffer_size = - uiop_properties->send_buffer_size (); - this->uiop_properties_.recv_buffer_size = - uiop_properties->recv_buffer_size (); + RTCORBA::UnixDomainProtocolProperties_var uiop_properties = + RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in (), + ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + if (!CORBA::is_nil (uiop_properties.in ())) + { + // Extract and locally store properties of interest. + this->uiop_properties_.send_buffer_size = + uiop_properties->send_buffer_size (); + this->uiop_properties_.recv_buffer_size = + uiop_properties->recv_buffer_size (); + } #else /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 106079f3dfc..fab6f62430c 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -333,22 +333,27 @@ TAO_Stub::parse_policies (void) CORBA::ULong length = policy_list->length (); // CORBA::ULong index = 0; + CORBA::ULong policy_type = 0; + + this->orb_core ()->get_protocols_hooks ()->call_policy_type_hook (policy_list, + policy_type); + for (unsigned int i = 0; i < length; ++i) { - if (((*policy_list)[i]->policy_type () == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)) + if (policy_type == 0) this->exposed_priority_model ((*policy_list)[i].in ()); - else if (((*policy_list)[i]->policy_type () == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)) + else if (policy_type == 1) this->exposed_priority_banded_connection ((*policy_list)[i].in ()); - else if (((*policy_list)[i]->policy_type () == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)) + else if (policy_type == 2) this->exposed_client_protocol ((*policy_list)[i].in ()); } this->are_policies_parsed_ = 1; } -TAO_PriorityModelPolicy * +CORBA::Policy * TAO_Stub::exposed_priority_model (void) { if (!this->are_policies_parsed_) @@ -360,25 +365,16 @@ TAO_Stub::exposed_priority_model (void) return this->priority_model_policy_; } -void TAO_Stub::exposed_priority_model (CORBA::Policy_ptr policy) +void +TAO_Stub::exposed_priority_model (CORBA::Policy_ptr policy) { if (!CORBA::is_nil (policy)) { - RTCORBA::PriorityModelPolicy *pm_policy = 0; - pm_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy); - - if (!CORBA::is_nil (pm_policy)) - { - this->priority_model_policy_ = - ACE_static_cast (TAO_PriorityModelPolicy *, - pm_policy); - - } + this->priority_model_policy_ = policy; } } -TAO_PriorityBandedConnectionPolicy * +CORBA::Policy * TAO_Stub::exposed_priority_banded_connection (void) { if (!this->are_policies_parsed_) @@ -395,18 +391,12 @@ TAO_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy) { if (!CORBA::is_nil (policy)) { - RTCORBA::PriorityBandedConnectionPolicy_ptr pbc_policy = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy); - - if (!CORBA::is_nil (pbc_policy)) - { - this->priority_banded_connection_policy_ = - ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, - pbc_policy); - } + this->priority_banded_connection_policy_ = + policy; } } -TAO_ClientProtocolPolicy * + +CORBA::Policy * TAO_Stub::exposed_client_protocol (void) { if (!this->are_policies_parsed_) @@ -423,15 +413,7 @@ TAO_Stub::exposed_client_protocol (CORBA::Policy_ptr policy) { if (!CORBA::is_nil (policy)) { - RTCORBA::ClientProtocolPolicy_ptr cp_policy = - RTCORBA::ClientProtocolPolicy::_narrow (policy); - - if (!CORBA::is_nil (cp_policy)) - { - this->client_protocol_policy_ = - ACE_static_cast (TAO_ClientProtocolPolicy *, - cp_policy); - } + this->client_protocol_policy_ = policy; } } @@ -446,22 +428,24 @@ TAO_Stub::get_policy (CORBA::PolicyType type, #if (TAO_HAS_RT_CORBA == 1) + CORBA::ULong type_value = 0; + // Validity check. Make sure requested policy type is appropriate // for this scope. - if (type == RTCORBA::THREADPOOL_POLICY_TYPE - || type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE) - ACE_THROW_RETURN (CORBA::INV_POLICY (), - CORBA::Policy::_nil ()); + this->orb_core_->get_protocols_hooks ()->validate_policy_type (type, + type_value, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); // If we are dealing with a client exposed policy, check if any // value came in the IOR/reconcile IOR value and overrides. - if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) + if (type_value == 0) return this->exposed_priority_model (); - if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) + if (type_value == 1) return this->effective_priority_banded_connection (ACE_TRY_ENV); - if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) + if (type_value == 2) return this->effective_client_protocol (ACE_TRY_ENV); #endif /* TAO_HAS_RT_CORBA == 1 */ @@ -497,14 +481,26 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type, #if (TAO_HAS_RT_CORBA == 1) + CORBA::ULong type_value = 0; + // Validity check. Make sure requested policy type is appropriate // for this scope. - if (type == RTCORBA::THREADPOOL_POLICY_TYPE - || type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE - || type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) + this->orb_core_->get_protocols_hooks () ->validate_policy_type (type, + type_value, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + + // @@ Here, an exception is to be thrown if type is one of the three + // cases. The validate_policy_type + // throws an exception for the first two policy types but here we + // need to throw an excpetion for priority moel policy type too. So, + // for software reuse, checking on the value of type_value to (or + // not to) throw an exception. (Priyanka) + if (type_value == 0) ACE_THROW_RETURN (CORBA::INV_POLICY (), CORBA::Policy::_nil ()); + #endif /* TAO_HAS_RT_CORBA == 1 */ CORBA::Policy_var result; @@ -566,9 +562,19 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::ULong slot = policy->policy_type (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - if (slot == RTCORBA::THREADPOOL_POLICY_TYPE - || slot == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE - || slot == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) + CORBA::ULong type_value = 0; + + // @@ Throws CORBA::NO_PERMISSION as of now. + // Not sure if this is right .. since validate_policy_type + // throws a INV_Policy exception and am throwing + // NO_PERMISSION exception now. + this->orb_core_->get_protocols_hooks ()->validate_policy_type (slot, + type_value, + ACE_TRY_ENV); + ACE_THROW_RETURN (CORBA::NO_PERMISSION (), + 0); + + if (type_value == 0) ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0); } @@ -645,7 +651,7 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies, // @@ For some combinations of RTCORBA policies, location forwarding // isn't supported. See <forward> method implementations in // Invocation_Endpoint_Selectors.cpp for more information. - // + // ACE_TRY { for (;;) @@ -655,11 +661,11 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies, int status = locate_request.invoke (ACE_TRY_ENV); ACE_TRY_CHECK; - + // We'll get this only if the object was, in fact, forwarded. if (status == TAO_INVOKE_RESTART) continue; - + if (status != TAO_INVOKE_OK) { ACE_TRY_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, @@ -670,7 +676,7 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies, } ACE_CATCH (CORBA::INV_POLICY, ex) { - inconsistent_policies = + inconsistent_policies = locate_request.get_inconsistent_policies (); return 0; } @@ -843,10 +849,10 @@ TAO_Stub::buffering_constraint (void) #if (TAO_HAS_RT_CORBA == 1) -TAO_PrivateConnectionPolicy * +CORBA::Policy * TAO_Stub::private_connection (void) { - TAO_PrivateConnectionPolicy *result = 0; + CORBA::Policy *result = 0; // No need to lock, the stub only changes its policies at // construction time... @@ -878,10 +884,10 @@ TAO_Stub::private_connection (void) return result; } -TAO_ClientProtocolPolicy * +CORBA::Policy * TAO_Stub::client_protocol (void) { - TAO_ClientProtocolPolicy *result = 0; + CORBA::Policy *result = 0; // No need to lock, the stub only changes its policies at // construction time... @@ -914,10 +920,10 @@ TAO_Stub::client_protocol (void) return result; } -TAO_PriorityBandedConnectionPolicy * +CORBA::Policy * TAO_Stub::priority_banded_connection (void) { - TAO_PriorityBandedConnectionPolicy *result = 0; + CORBA::Policy *result = 0; // No need to lock, the stub only changes its policies at // construction time... @@ -949,15 +955,15 @@ TAO_Stub::priority_banded_connection (void) return result; } -TAO_PriorityBandedConnectionPolicy * +CORBA::Policy * TAO_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV) { // Get effective override. - TAO_PriorityBandedConnectionPolicy *override = + CORBA::Policy *override = this->priority_banded_connection (); // Get the value from the ior. - TAO_PriorityBandedConnectionPolicy *exposed = + CORBA::Policy *exposed = this->exposed_priority_banded_connection (); // Reconcile client-exposed and locally set values. @@ -967,68 +973,45 @@ TAO_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV) if (override == 0) return exposed; - // Both override and exposed have been set. - // See if either of them has empty priority bands. - CORBA::Object_var auto_release_exp = exposed; - CORBA::Object_var auto_release_ov = override; - - if (exposed->priority_bands_rep ().length () == 0) - { - auto_release_ov._retn (); - return override; - } - - if (override->priority_bands_rep ().length () == 0) - { - auto_release_exp._retn (); - return exposed; - } - - // Both override and exposed have been set and neither has empty - // priority bands. This is illegal (ptc/99-05-03, sec. 4.12.1). + CORBA::Policy *policy = + this->orb_core_->get_protocols_hooks ()-> + effective_priority_banded_connection_hook ( + override, + exposed, + ACE_TRY_ENV); ACE_THROW_RETURN (CORBA::INV_POLICY (), 0); + + return policy; } -TAO_ClientProtocolPolicy * +CORBA::Policy * TAO_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV) { // Get effective override. - TAO_ClientProtocolPolicy *override = + CORBA::Policy_var override = this->client_protocol (); // Get the value from the ior. - TAO_ClientProtocolPolicy *exposed = + CORBA::Policy_var exposed = this->exposed_client_protocol (); // Reconcile client-exposed and locally set values. - if (exposed == 0) - return override; - - if (override == 0) - return exposed; - - // Both override and exposed have been set. - // See if either of them has empty priority bands. - CORBA::Object_var auto_release_exp = exposed; - CORBA::Object_var auto_release_ov = override; + if (CORBA::is_nil (exposed.in ())) + return override.in (); - if (exposed->protocols_rep ().length () == 0) - { - auto_release_ov._retn (); - return override; - } + if (CORBA::is_nil (override.in ())) + return exposed.in (); - if (override->protocols_rep ().length () == 0) - { - auto_release_exp._retn (); - return exposed; - } - - // Both override and exposed have been set and neither has empty - // protocols. This is illegal (ptc/99-05-03, sec. 4.15.4). + CORBA::Policy_var policy = + this->orb_core_->get_protocols_hooks ()->effective_client_protocol_hook ( + override.in (), + exposed.in (), + ACE_TRY_ENV); ACE_THROW_RETURN (CORBA::INV_POLICY (), 0); + + return policy.in (); } #endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index d15ca555f3e..f2e48fdfe1c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -142,18 +142,21 @@ public: #if (TAO_HAS_RT_CORBA == 1) - /// Returns the RTCORBA::PriorityModelPolicy exported + /// Returns the CORBA::Policy (which will be narrowed to be + /// used as RTCORBA::PriorityModelPolicy) exported /// in object's IOR. - TAO_PriorityModelPolicy *exposed_priority_model (void); - - /// Returns the RTCORBA::PriorityBandedConnectionPolicy exported + CORBA::Policy *exposed_priority_model (void); + + /// Returns the CORBA::Policy (which will be narrowed and used + /// as RTCORBA::PriorityBandedConnectionPolicy) exported /// in object's IOR. - TAO_PriorityBandedConnectionPolicy *exposed_priority_banded_connection (void); - - /// Returns the RTCORBA::ClientProtocolPolicy exported + CORBA::Policy *exposed_priority_banded_connection (void); + + /// Returns the CORBA::Policy (which will be narrowed and used + /// as RTCORBA::ClientProtocolPolicy) exported /// in object's IOR. - TAO_ClientProtocolPolicy *exposed_client_protocol (void); - + CORBA::Policy *exposed_client_protocol (void); + # endif /*TAO_HAS_RT_CORBA == 1*/ // = Methods for obtaining effective overrides. @@ -183,12 +186,11 @@ public: #if (TAO_HAS_RT_CORBA == 1) - TAO_PrivateConnectionPolicy *private_connection (void); + CORBA::Policy *private_connection (void); - TAO_PriorityBandedConnectionPolicy * - priority_banded_connection (void); + CORBA::Policy *priority_banded_connection (void); - TAO_ClientProtocolPolicy *client_protocol (void); + CORBA::Policy *client_protocol (void); // = Methods for obtaining effective policies. // @@ -197,11 +199,11 @@ public: // override for a given policy type, and then reconciling it with // the policy value exported in the Object's IOR. - TAO_PriorityBandedConnectionPolicy * + CORBA::Policy * effective_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); - TAO_ClientProtocolPolicy * + CORBA::Policy * effective_client_protocol (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -222,7 +224,7 @@ public: * equivalent). */ CORBA::ULong hash (CORBA::ULong maximum, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); /// Implement the is_equivalent() method for the CORBA::Object CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj); @@ -380,11 +382,11 @@ private: // parse the MProfile's policy list each time we // are asked about a given policy. - TAO_PriorityModelPolicy *priority_model_policy_; + CORBA::Policy *priority_model_policy_; - TAO_PriorityBandedConnectionPolicy *priority_banded_connection_policy_; + CORBA::Policy *priority_banded_connection_policy_; - TAO_ClientProtocolPolicy *client_protocol_policy_; + CORBA::Policy *client_protocol_policy_; CORBA::Boolean are_policies_parsed_; |