diff options
author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-02 22:50:52 +0000 |
---|---|---|
committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-02 22:50:52 +0000 |
commit | a398fbede8df6a14326ab328f646b4709f8b922e (patch) | |
tree | c9ed5afa03625b7df5fd3f0431410029aa23b71d /TAO | |
parent | 65b9aeb32d2accc19129639935eb21de554637b5 (diff) | |
download | ATCD-a398fbede8df6a14326ab328f646b4709f8b922e.tar.gz |
Mon Oct 2 15:25:16 2000 Priyanka Gontla <pgontla@ece.uci.edu>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 24 | ||||
-rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 391 | ||||
-rw-r--r-- | TAO/tao/CORBALOC_Parser.h (renamed from TAO/tao/ior_corbaloc/CORBALOC_Parser.h) | 96 | ||||
-rw-r--r-- | TAO/tao/CORBALOC_Parser.i (renamed from TAO/tao/ior_corbaloc/CORBALOC_Parser.i) | 0 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/Makefile | 63 | ||||
-rw-r--r-- | TAO/tao/IORManipulation/Makefile | 2 | ||||
-rw-r--r-- | TAO/tao/IORTable/Makefile | 17 | ||||
-rw-r--r-- | TAO/tao/Makefile | 1025 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Makefile | 374 | ||||
-rw-r--r-- | TAO/tao/SHMIOP_Profile.cpp | 37 | ||||
-rw-r--r-- | TAO/tao/default_resource.cpp | 15 | ||||
-rw-r--r-- | TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp | 453 | ||||
-rw-r--r-- | TAO/tao/ior_corbaloc_export.h (renamed from TAO/tao/ior_corbaloc/ior_corbaloc_export.h) | 0 |
13 files changed, 1710 insertions, 787 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 90699b7cff6..64f3dc887dd 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,27 @@ +Mon Oct 2 15:25:16 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/default_resource.h (TAO_Default_Resource_Factory): + * tao/default_resource.cpp (get_parser_names): + Added CORBALOC_Parser in the list of IOR parsers. + + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.cpp: + * tao/ior_corbaloc_export.h: + * tao/CORBALOC_Parser.i: + Moved these files from the sub-directory ior_corbaloc to tao. + Added support for uiop and shmiop protocols in the corbaloc url. + So, finally TAO supports corbaloc scheme. + + * tao/Makefile: + Added the CORBALOC_Parser files. + + * tao/SHMIOP_Profile.cpp (parse_string): + Added support so that if the host is not specified, the host is + to be defaulted to the local host. + + * tests/ior_corbaloc/ior_corbaloc_client_i.cpp (init): + Added some comments. + Mon Oct 02 17:16:38 2000 David L. Levine <levine@cs.wustl.edu> * orbsvcs/orbsvcs/Makefile.CosEvent: inserted diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp new file mode 100644 index 00000000000..f20331074a3 --- /dev/null +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -0,0 +1,391 @@ +// $Id$ + +#include "CORBALOC_Parser.h" + +#if !defined(__ACE_INLINE__) +#include "CORBALOC_Parser.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(tao, CORBALOC_Parser, "$Id$") + +TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) +{ +} + +static const char corbaloc_prefix[] = "corbaloc:"; + +int +TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const +{ + // Check if the prefix is 'corbaloc:' and return the result. + return (ACE_OS::strncmp (ior_string, + corbaloc_prefix, + sizeof corbaloc_prefix - 1) == 0); +} + +void +TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name, + CORBA::ULong &addr_list_length, + CORBA::ULong + &count_addr, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + + CORBA::Boolean start_key_string = 1; + + for (const char *i = corbaloc_name; *i != '\0'; ++i) + { + if (*i == ',') + { + // Increment the count of the addresses in the list + ++count_addr; + } + + if (*i == '/') + { + if (*(i+1) == '/') + { + ++i; + ++addr_list_length; + } + else if (*(i+1) != '/') + { + // Indication that the next characters are to be + // assigned to key_string + start_key_string = 0; + } + } + + if (start_key_string == 1) + { + ++addr_list_length; + } + } + +} + +void +TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong + &addr_list_length, + CORBA::Environment + &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + + CORBA::String_var end_point; + const char protocol_prefix[] = "//"; + const char iiop_prefix[] = "iiop:"; + const char uiop_prefix[] = "uiop:"; + + if (ACE_OS::strncmp (cloc_name_ptr, + protocol_prefix, + sizeof (protocol_prefix)-1) == 0) + { + // If there is no protocol explicitly specified, it defaults + // down to <iiop:> ... so allocate memory even for that and + // later append the prefix. + + // Allocation of memory + end_point = CORBA::string_alloc (addr_list_length + + sizeof (iiop_prefix) + + 1 + // For the seperator + key_string.length ()); + + // Copy the default <iiop:> prefix. + ACE_OS::strcpy (end_point, + iiop_prefix); + + // Append the endpoint that is being passed. + ACE_OS::strcat (end_point, + cloc_name_ptr); + + } + else + { + // The case where the protocol to be used is explicitly + // specified. + + // Allocate memory for the end_point. + end_point = CORBA::string_alloc (addr_list_length + + 1 + // For the seperator + key_string.length ()); + + ACE_OS::strcpy (end_point, + cloc_name_ptr); + + } + + if (ACE_OS::strncmp (cloc_name_ptr, + uiop_prefix, + sizeof (uiop_prefix)-1) == 0) + { + // The separator for the uiop protocol is '|'. This should + // actually be later changed so that the separator is '/' as the + // other protocols. + ACE_OS::strcat (end_point, + "|"); + } + else + { + ACE_OS::strcat (end_point, + "/"); + } + + // Append the key string. + ACE_OS::strcat (end_point, + key_string.c_str ()); + + // Call the mprofile helper which makes an mprofile for this + // endpoint and adds it to the big mprofile. + this->parse_string_mprofile_helper (end_point, + ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong + &addr_list_length, + ACE_CString &key_string, + ACE_CString &cloc_name, + CORBA::Environment + &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + char *cloc_name_ptr = 0; + + // Tokenize using "," as the seperator + char *last_addr = 0; + + cloc_name_ptr = + ACE_OS::strtok_r (ACE_const_cast (char *, cloc_name.c_str ()), + ",", + &last_addr); + + while (cloc_name_ptr != 0) + { + // Forms the endpoint and calls the mprofile_helper. + assign_key_string (cloc_name_ptr, + key_string, + addr_list_length, + ACE_TRY_ENV); + ACE_CHECK; + + // Get the next token. + cloc_name_ptr = ACE_OS::strtok_r (NULL, + ",", + &last_addr); + } +} + + +void +TAO_CORBALOC_Parser::parse_string_mprofile_helper (CORBA::String_var end_point, + CORBA::Environment + &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + + TAO_MProfile jth_mprofile; + // = new TAO_MProfile; + + int retv = + this->orb_->orb_core ()->connector_registry ()->make_mprofile + (end_point.in (), + jth_mprofile, + ACE_TRY_ENV); + + if (retv != 0) + { + ACE_THROW(CORBA::INV_OBJREF ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO)); + } + + + // Add this profile to the main mprofile. + TAO_MProfile *jth_mprofile_ptr = &jth_mprofile; + + int result = mprofile_.add_profiles (jth_mprofile_ptr); + + if (result == -1) + { + // The profle is not added. Either ways, go to the + // next endpoint. + } + +} + +CORBA::Object_ptr +TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + + CORBA::Object_ptr obj = CORBA::Object::_nil (); + + // Now make the TAO_Stub. + TAO_Stub *data = 0; + ACE_NEW_THROW_EX (data, + TAO_Stub ((char *) 0, this->mprofile_, + this->orb_->orb_core ()), + CORBA::NO_MEMORY ( + CORBA_SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + TAO_Stub_Auto_Ptr safe_data (data); + + obj = this->orb_->orb_core ()->create_object (data); + + if (!CORBA::is_nil (obj)) + { + // All is well, so release the stub object from its + // auto_ptr. + (void) safe_data.release (); + + // Return the object reference to the application. + return obj; + } + + // Shouldnt come here: if so, return nil reference. + return CORBA::Object::_nil (); +} + +CORBA::Object_ptr +TAO_CORBALOC_Parser::parse_string_rir_helper (const char * + &corbaloc_name, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + + const char rir_prefix [] = "rir:/"; + CORBA::Object_ptr rir_obj = CORBA::Object::_nil (); + + // "rir" protocol. Pass the key string as an + // argument to the resolve_initial_references () + const char *key_string = + corbaloc_name + sizeof (rir_prefix) -1; + + if (ACE_OS::strcmp (key_string, "") == 0) + { + // If the key string is empty, assume the default + // "NameService". + key_string = "NameService"; + } + + rir_obj = this->orb_->resolve_initial_references (key_string, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return rir_obj; +} + +int +TAO_CORBALOC_Parser::check_prefix (const char *end_point) +{ + + // This checks if the prefix is "rir:" or not. Returns a -1 if it is + // "rir:" else returns a zero; + // Check for a valid string + if (!end_point || !*end_point) + return -1; // Failure + + const char *protocol[] = {"rir:"}; + + size_t slot = ACE_OS::strchr (end_point, '/') - end_point; + + size_t len0 = ACE_OS::strlen (protocol[0]); + + // Check for the proper prefix in the IOR. If the proper prefix + // isn't in the IOR then it is not an IOR we can use. + if (slot == len0 + && ACE_OS::strncasecmp (end_point, protocol[0], len0) == 0) + return 0; + + return 1; +} + +CORBA::Object_ptr +TAO_CORBALOC_Parser::parse_string (const char *ior, + CORBA::ORB_ptr orb, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->orb_ = CORBA::ORB::_duplicate (orb); + + // Skip the prefix, we know it is there because this method in only + // called if <match_prefix> returns 1. + const char *corbaloc_name = + ior + sizeof corbaloc_prefix - 1; + + CORBA::Object_ptr object = CORBA::Object::_nil (); + + // No of endpoints + CORBA::ULong count_addr = 1; + + // Length of obj_addr_list + CORBA::ULong addr_list_length = 0; + + // If the protocol is not "rir:" + if (this->check_prefix (corbaloc_name) != 0) + { + // Count the length of the obj_addr_list and number of + // endpoints in the obj_addr_list + this->parse_string_count_helper (corbaloc_name, + addr_list_length, + count_addr, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + // Convert corbaloc_name as a ACE_CString + ACE_CString corbaloc_name_str (corbaloc_name, 0, 1); + + // Get the key_string which is a substring of corbaloc_name_str + ACE_CString key_string = + corbaloc_name_str.substring ((addr_list_length+1), -1); + + // Copy the <obj_addr_list> to cloc_name. + ACE_CString cloc_name (corbaloc_name, + addr_list_length, + 0, + 1); + + // Get each endpoint: For each endpoint, make a mprofile and add + // it to the one big mprofile whose reference is passed to the + // application + this->parse_string_assign_helper (addr_list_length, + key_string, + cloc_name, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + // Create the stub for the mprofile and get the object reference + // to it which is to be returned to the client application. + object = this->make_stub_from_mprofile (ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + } + else + { + // RIR case: + object = this->parse_string_rir_helper (corbaloc_name, + ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + } + + return object; +} + + +ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser) + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Array_Base<char *>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +pragma instantiate ACE_Array_Base<char *> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ior_corbaloc/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 9ccc4dd0996..39f9fcba084 100644 --- a/TAO/tao/ior_corbaloc/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -19,48 +19,22 @@ #include "ace/pre.h" #include "tao/ORB.h" -#include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" #include "tao/IOR_Parser.h" -#include "tao/Parser_Registry.h" - -#include "ace/SString.h" -#include "ace/Dynamic_Service.h" -#include "ace/Service_Repository.h" -#include "ace/Object_Manager.h" -#include "ace/SOCK_Dgram_Mcast.h" -#include "ace/SOCK_Acceptor.h" -#include "ace/Thread_Manager.h" -#include "ace/Read_Buffer.h" -#include "ace/Auto_Ptr.h" -#include "ace/Arg_Shifter.h" - -#include "tao/Object.h" -#include "tao/Typecode.h" -#include "tao/NVList.h" + #include "tao/Stub.h" -#include "tao/DynamicAny/DynAny_i.h" #include "tao/ORB_Core.h" -#include "tao/Server_Strategy_Factory.h" -#include "tao/debug.h" -#include "tao/TAO_Internal.h" -#include "tao/CDR.h" -//#include "tao/IOR_LookupTable.h" -#include "tao/PortableServer/Object_Adapter.h" + #include "tao/PortableServer/POA.h" -#include "tao/Request.h" #include "tao/MProfile.h" -#include "tao/IOR_Parser.h" -#include "tao/Pluggable.h" - #include "ior_corbaloc_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_IOR_CORBALOC_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser +class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser { // = TITLE // Implements the <corbaloc:> IOR format @@ -78,18 +52,26 @@ public: virtual ~TAO_CORBALOC_Parser (void); // The destructor + virtual int match_prefix (const char *ior_string) const; // = The IOR_Parser methods, please read the documentation in // IOR_Parser.h - virtual int match_prefix (const char *ior_string) const; virtual CORBA::Object_ptr parse_string (const char *ior, CORBA::ORB_ptr orb, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); + // Parse the ior-string that is passed. private: + + CORBA::ORB_var orb_; + // ORB + + TAO_MProfile mprofile_; + // One big mprofile which consists the profiles of all the endpoints. + virtual int check_prefix (const char *endpoint); - // Checks the prefix (IIOP or RIR for now); + // Checks the prefix to see if it is RIR. virtual void parse_string_count_helper (const char * &corbaloc_name, CORBA::ULong &addr_list_length, @@ -99,22 +81,29 @@ public: // Helps count the length of the <obj_addr_list> and the number of // individual <obj_addr> in the <obj_addr_list>. - virtual CORBA::Object_ptr parse_string_mprofile_helper (ACE_Array_Base <char *> &addr, - CORBA::ULong &count_addr, - CORBA::ORB_ptr orb, - CORBA::Environment &) + virtual void + parse_string_mprofile_helper (CORBA::String_var end_point, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); + // Creates a MProfile for the endpoint passed and each such mprofile + // is added to the big mprofile <mprofile_> from which a pointer to + // the Object represented by the key_string is obtained and passed + // to the application. + + virtual CORBA::Object_ptr + make_stub_from_mprofile (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); - // Creates a MProfile for the endpoints in the <obj_addr_list> and - // finally returns a pointer to the Object represented by the key_string. + // Make a stub from the MProfile that is created in + // parse_string_mprofile_helper. Using this stub, create an object + // reference which is sent to the application. - virtual CORBA::Object_ptr parse_string_rir_helper (const char * &corbaloc_name, - CORBA::ORB_ptr orb, - CORBA::Environment &) + virtual CORBA::Object_ptr + parse_string_rir_helper (const char * &corbaloc_name, + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); // Gets the pointer to the key_string when the protocol used is RIR - virtual void parse_string_assign_helper (ACE_Array_Base <char *> &addr, - CORBA::ULong &addr_list_length, + virtual void parse_string_assign_helper (CORBA::ULong &addr_list_length, ACE_CString &key_string, ACE_CString &cloc_name, CORBA::Environment &) @@ -122,32 +111,23 @@ public: // Tokenizes the <obj_addr_list> using "," as the seperator. Assigns // individual endpoints to the elements of the ACE_Array_Base. - virtual void assign_iiop_prefix_key_string (ACE_Array_Base <char *> &addr, - char * &cloc_name_ptr, - ACE_CString &key_string, - CORBA::ULong ¤t_addr, - CORBA::ULong &addr_list_length); - // Helps parse_string_assign_helper by assigning in the case when - // the protocol name is missing and we have to append the default - // protocol <iiop:> and the key string. - - virtual void assign_key_string(ACE_Array_Base <char *> &addr, - char * &cloc_name_ptr, - ACE_CString &key_string, - CORBA::ULong ¤t_addr, - CORBA::ULong &addr_list_length); + virtual void + assign_key_string(char * &cloc_name_ptr, + ACE_CString &key_string, + CORBA::ULong &addr_list_length, + CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)); // Helps parse_string_assign_helper by assigning in the case when // the protocol name is present and we have to append jsut the key // string. - }; #if defined (__ACE_INLINE__) # include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ -ACE_FACTORY_DECLARE (TAO_IOR_CORBALOC, TAO_CORBALOC_Parser) +ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser) #include "ace/post.h" #endif /* TAO_CORBALOC_PARSER_H */ diff --git a/TAO/tao/ior_corbaloc/CORBALOC_Parser.i b/TAO/tao/CORBALOC_Parser.i index 679b6208536..679b6208536 100644 --- a/TAO/tao/ior_corbaloc/CORBALOC_Parser.i +++ b/TAO/tao/CORBALOC_Parser.i diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 01b54202f2c..9a387190c21 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -172,8 +172,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -309,6 +309,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -455,8 +457,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -592,6 +594,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -742,8 +746,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -879,6 +883,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1025,8 +1031,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1162,6 +1168,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1194,8 +1202,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i DynamicAnyC.i \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + 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 \ @@ -1310,8 +1317,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1447,6 +1454,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1479,8 +1488,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i DynamicAnyC.i \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + 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 \ @@ -1595,8 +1603,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1732,6 +1740,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1878,8 +1888,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2015,6 +2025,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2047,8 +2059,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i DynamicAnyC.i \ - DynAnyFactory.h \ - $(TAO_ROOT)/tao/Marshal.h \ + 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 \ @@ -2163,8 +2174,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2300,6 +2311,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2447,8 +2460,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 \ - DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2584,6 +2597,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 38ff04745ef..6966f243b22 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -594,6 +594,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(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 3aeae30e368..1a2f3d1b818 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -299,6 +299,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -579,6 +581,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -610,8 +614,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/InterfaceC.h \ $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/BoundsC.i \ - iortable_export.h IORTableC.i + $(TAO_ROOT)/tao/BoundsC.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 \ @@ -706,6 +710,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -730,8 +736,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -860,6 +864,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -895,7 +901,6 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ $(ACE_ROOT)/ace/pre.h IORTable.h \ - iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1140,6 +1145,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 58f7a8d472d..f47676a94f0 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -82,6 +82,7 @@ PUB_HDRS = \ IOR_Parser \ DLL_Parser \ FILE_Parser \ + CORBALOC_Parser \ CORBA_String PLUGGABLE_PROTOCOLS_FILES = \ @@ -238,6 +239,7 @@ ORB_CORE_FILES = \ IOR_Parser \ DLL_Parser \ FILE_Parser \ + CORBALOC_Parser \ Bind_Dispatcher_Guard \ Fault_Tolerance_Service @@ -691,6 +693,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Client_Strategy_Factory.h \ Wait_Strategy.h \ @@ -938,6 +942,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h @@ -1200,14 +1206,14 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ params.h \ + CORBA_String.h \ + CORBA_String.inl \ params.i \ Connector_Registry.i \ ORB_Core.h \ ORB.h \ Services.h \ Services.i \ - CORBA_String.h \ - CORBA_String.inl \ PortableInterceptor.h \ Request_Info.h \ PortableInterceptorC.h \ @@ -1257,6 +1263,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Profile.h \ Tagged_Components.h \ @@ -1506,6 +1514,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ MProfile.h \ MProfile.i \ @@ -2136,6 +2146,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -2444,6 +2456,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -2729,6 +2743,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ debug.h \ iiop_endpoints.h \ @@ -3026,6 +3042,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -3343,11 +3361,32 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ 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 + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + 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 .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \ IIOP_Acceptor.h \ @@ -3617,6 +3656,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -3932,6 +3973,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ @@ -4593,6 +4636,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -4903,6 +4948,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -5224,6 +5271,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ debug.h \ uiop_endpoints.h \ @@ -5527,6 +5576,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -5851,10 +5902,31 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + 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 .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp \ UIOP_Acceptor.h \ @@ -6128,6 +6200,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -6440,6 +6514,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -6958,6 +7034,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -7240,6 +7318,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ debug.h \ iiop_endpoints.h \ @@ -7546,6 +7626,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -7873,6 +7955,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Client_Strategy_Factory.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -8154,6 +8238,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -8453,6 +8539,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ @@ -8954,6 +9042,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Wait_On_Read.h \ Wait_Strategy.h \ @@ -9190,6 +9280,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \ @@ -9414,6 +9506,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ debug.h \ IIOP_Factory.h \ @@ -10103,8 +10197,7 @@ realclean: ORB.i \ Marshal.i -.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \ - Marshal.h \ +.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10623,6 +10716,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ debug.h @@ -11297,6 +11392,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \ @@ -11532,6 +11629,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Request.h \ @@ -11799,6 +11898,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Request.h \ @@ -12227,6 +12328,8 @@ realclean: Adapter.i \ Service_Callbacks.h \ Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Server_Strategy_Factory.h \ @@ -12271,8 +12374,7 @@ realclean: Client_Priority_Policy.i \ Buffering_Constraint_Policy.h \ Buffering_Constraint_Policy.i \ - Object_KeyC.h \ - Object_KeyC.i + Object_KeyC.h Object_KeyC.i .obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \ corbafwd.h \ @@ -12600,6 +12702,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -13497,6 +13601,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -13763,6 +13869,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i Invocation.h \ Synch_Reply_Dispatcher.h \ @@ -14453,6 +14561,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h @@ -14645,8 +14755,7 @@ 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 \ +.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 \ @@ -14880,6 +14989,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ NVList.h \ @@ -15317,6 +15428,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \ @@ -15595,8 +15708,7 @@ realclean: PortableInterceptor.i \ ORB.i -.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \ - Timeprobe.h \ +.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15815,6 +15927,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ 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 \ @@ -15850,8 +15964,7 @@ realclean: $(ACE_ROOT)/ace/Service_Object.i \ TAO_Export.h -.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \ - debug.h \ +.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -16303,6 +16416,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Principal.h \ @@ -16601,6 +16716,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Transport_Mux_Strategy.h @@ -16868,6 +16985,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Principal.h \ @@ -17374,6 +17493,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -17653,6 +17774,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -17932,6 +18055,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ debug.h \ @@ -18283,6 +18408,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ ORB_Table.h \ ORB_Table.inl \ @@ -18586,6 +18713,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \ @@ -18807,6 +18936,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.i @@ -19127,6 +19258,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i @@ -19356,6 +19489,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -19454,6 +19589,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + CORBA_String.h \ + CORBA_String.inl \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ params.i @@ -19681,6 +19818,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Client_Strategy_Factory.h @@ -20027,6 +20166,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i @@ -20848,6 +20989,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ 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 \ @@ -21070,6 +21213,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -21079,13 +21224,14 @@ realclean: Transport_Mux_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -21168,7 +21314,6 @@ realclean: 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 \ @@ -21189,13 +21334,14 @@ realclean: $(ACE_ROOT)/ace/pre.h \ Transport_Mux_Strategy.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -21278,7 +21424,6 @@ realclean: 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 \ @@ -21362,13 +21507,14 @@ realclean: $(ACE_ROOT)/ace/pre.h \ Transport_Mux_Strategy.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -21451,7 +21597,6 @@ realclean: 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 \ @@ -21534,13 +21679,14 @@ realclean: Reply_Dispatcher.h \ $(ACE_ROOT)/ace/pre.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -21623,7 +21769,6 @@ realclean: 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 \ @@ -21643,13 +21788,14 @@ realclean: $(ACE_ROOT)/ace/pre.h \ Reply_Dispatcher.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -21732,7 +21878,6 @@ realclean: 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 \ @@ -21866,6 +22011,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Wait_Strategy.h @@ -21895,6 +22042,7 @@ realclean: $(ACE_ROOT)/ace/OS.i \ Reply_Dispatcher.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -21963,7 +22111,6 @@ realclean: try_macros.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 \ @@ -22097,6 +22244,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.h \ Leader_Follower.i \ @@ -22128,6 +22277,7 @@ realclean: $(ACE_ROOT)/ace/OS.i \ Reply_Dispatcher.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -22196,7 +22346,6 @@ realclean: try_macros.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 \ @@ -22318,15 +22467,15 @@ realclean: Request.i \ debug.h -.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ - $(ACE_ROOT)/ace/pre.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ +.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -22409,7 +22558,6 @@ realclean: 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 \ @@ -22420,8 +22568,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ + Sequence_T.cpp IOPC.i \ Any.h \ Environment.h \ Environment.i \ @@ -22436,16 +22583,15 @@ 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 \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.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 \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -22528,7 +22674,6 @@ realclean: 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 \ @@ -22539,12 +22684,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 + 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 \ @@ -22778,6 +22919,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -23140,13 +23283,14 @@ realclean: Tagged_Components.h \ $(ACE_ROOT)/ace/pre.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -23229,7 +23373,6 @@ realclean: 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 \ @@ -23366,10 +23509,11 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i -.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \ - GIOPC.h \ +.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -24470,13 +24614,13 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + Exception.h \ + Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Adapter.i \ - Exception.h \ - Exception.i \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -24597,6 +24741,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp @@ -24722,12 +24868,15 @@ realclean: .obj/Service_Callbacks.o .obj/Service_Callbacks.so .shobj/Service_Callbacks.o .shobj/Service_Callbacks.so: Service_Callbacks.cpp \ Service_Callbacks.h \ $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + IOPC.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -24810,9 +24959,35 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - TAO_Export.h \ corbafwd.i \ - Service_Callbacks.i + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + IOPC.i \ + Service_Callbacks.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 \ + Exception.i \ + Typecode.h \ + Typecode.i \ + Environment.h \ + Environment.i \ + PolicyC.i .obj/Parser_Registry.o .obj/Parser_Registry.so .shobj/Parser_Registry.o .shobj/Parser_Registry.so: Parser_Registry.cpp \ Parser_Registry.h \ @@ -25034,6 +25209,8 @@ realclean: Adapter.i \ Service_Callbacks.h \ Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ default_resource.h \ default_resource.i \ @@ -25270,8 +25447,8 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DLL_Parser.i Object_Loader.h Object_Loader.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DLL_Parser.i \ + Object_Loader.h Object_Loader.i \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -25399,8 +25576,7 @@ realclean: $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - FILE_Parser.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h FILE_Parser.i \ Object_Loader.h \ Object_Loader.i \ Object.h \ @@ -25460,6 +25636,364 @@ realclean: $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i +.obj/CORBALOC_Parser.o .obj/CORBALOC_Parser.so .shobj/CORBALOC_Parser.o .shobj/CORBALOC_Parser.so: CORBALOC_Parser.cpp CORBALOC_Parser.h \ + $(ACE_ROOT)/ace/pre.h \ + ORB.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/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_Export.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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(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/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/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(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/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 \ + Exception.h \ + 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 \ + PortableInterceptor.h \ + Request_Info.h \ + PortableInterceptorC.h \ + DynamicC.h \ + Any.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Environment.h \ + Environment.i \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + Typecode.h \ + Typecode.i \ + Any.i \ + IOPC.h \ + IOPC.i \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + PortableInterceptor.i \ + ORB.i \ + Acceptor_Registry.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/SString.h \ + $(ACE_ROOT)/ace/SString.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/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/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 \ + Resource_Factory.h \ + Protocol_Factory.h \ + Acceptor_Registry.i \ + Connector_Registry.h \ + params.h \ + params.i \ + 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.cpp \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Read_Buffer.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/Arg_Shifter.h \ + NVList.h \ + NVList.i \ + Stub.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + GIOP_Message_State.h \ + Pluggable_Messaging.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Pluggable_Messaging.i \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ + ORB_Core.h \ + Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ + Policy_Manager.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + ORB_Core.i \ + Stub.i \ + DynamicAny/DynAny_i.h \ + DynamicAny/DynamicAny.h \ + DynamicAny/dynamicany_export.h \ + Object_Loader.h \ + Object_Loader.i \ + DynamicAny/DynamicAnyC.h \ + corba.h \ + Principal.h \ + Principal.i \ + Request.h \ + Context.h \ + Context.i \ + Request.i \ + Server_Request.h \ + Object_KeyC.h \ + Object_KeyC.i \ + Server_Request.i \ + debug.h \ + Client_Strategy_Factory.h \ + Server_Strategy_Factory.h \ + Invocation.h \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + Synch_Reply_Dispatcher.i \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + operation_details.h \ + target_specification.h \ + target_specification.i \ + operation_details.i \ + Invocation.i \ + ObjectIDList.h \ + ObjectIDList.i \ + DomainC.h \ + DomainC.i \ + WrongTransactionC.h \ + InterfaceC.h \ + ifrfwd.h \ + BoundsC.h \ + BoundsC.i \ + DynamicAny/DynamicAnyC.i \ + TAO_Internal.h \ + PortableServer/Object_Adapter.h \ + PortableServer/portableserver_export.h \ + PortableServer/Key_Adapters.h \ + PortableServer/PortableServerC.h \ + PortableServer/PortableServerC.i \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(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 \ + PortableServer/Key_Adapters.i \ + PortableServer/poa_macros.h \ + PortableServer/RTPortableServerC.h \ + PortableServer/RTPortableServerC.i \ + PortableServer/Servant_Base.h \ + PortableServer/Servant_Base.i \ + PortableServer/Active_Object_Map.h \ + PortableServer/Active_Object_Map.i \ + PortableServer/Object_Adapter.i \ + PortableServer/POA.h \ + PortableServer/POAManager.h \ + PortableServer/POAManager.i \ + PortableServer/POA.i \ + ior_corbaloc_export.h CORBALOC_Parser.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 \ @@ -25571,6 +26105,232 @@ realclean: Reply_Dispatcher.i \ Transport_Mux_Strategy.h +.obj/Fault_Tolerance_Service.o .obj/Fault_Tolerance_Service.so .shobj/Fault_Tolerance_Service.o .shobj/Fault_Tolerance_Service.so: Fault_Tolerance_Service.cpp \ + Fault_Tolerance_Service.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.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/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(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/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/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(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/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 \ + Fault_Tolerance_Service.i \ + Service_Callbacks.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 \ + Service_Callbacks.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(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/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/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + Services_Activate.h \ + ORB_Core.h \ + ORB.h \ + Exception.h \ + Exception.i \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PortableInterceptor.h \ + Request_Info.h \ + PortableInterceptorC.h \ + DynamicC.h \ + 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 \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + PortableInterceptor.i \ + ORB.i \ + Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ + Policy_Manager.i \ + 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 \ + $(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/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/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 \ + Parser_Registry.h \ + Parser_Registry.i \ + ORB_Core.i \ + Client_Strategy_Factory.h + .obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \ Context.h \ $(ACE_ROOT)/ace/pre.h \ @@ -25961,6 +26721,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i @@ -26474,6 +27236,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Invocation.h \ @@ -26715,6 +27479,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Buffering_Constraint_Policy.h \ TAOC.h \ @@ -27724,6 +28490,7 @@ realclean: RTCORBAS.h \ IOPS.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -27792,7 +28559,6 @@ realclean: try_macros.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 \ @@ -27949,6 +28715,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Stub.i \ Priority_Mapping.h \ @@ -27981,6 +28749,7 @@ realclean: RTCORBAS.h \ IOPS.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -28049,7 +28818,6 @@ realclean: try_macros.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 \ @@ -28128,6 +28896,7 @@ realclean: RTCORBAS.h \ IOPS.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -28196,7 +28965,6 @@ realclean: try_macros.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 \ @@ -28277,6 +29045,7 @@ realclean: RTCORBAS.h \ IOPS.h \ IOPC.h \ + TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -28345,7 +29114,6 @@ realclean: try_macros.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 \ @@ -28633,6 +29401,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ @@ -28748,8 +29518,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ + Sequence_T.cpp IOPC.i \ PolicyC.h \ CurrentC.h \ Object.h \ @@ -28798,7 +29567,7 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i RTCORBAS.h orbconf.h \ - IOPS.h IOPC.h \ + IOPS.h IOPC.h TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -28867,7 +29636,6 @@ realclean: try_macros.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 \ @@ -28878,12 +29646,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 \ @@ -28903,8 +29667,7 @@ realclean: TimeBaseS_T.i \ TimeBaseS_T.cpp \ TimeBaseS.i RTCORBAC.h \ - corbafwd.h IOPC.h \ - PolicyC.h \ + corbafwd.h PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ @@ -29039,13 +29802,14 @@ realclean: $(ACE_ROOT)/ace/pre.h \ Pluggable_Messaging_Utils.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29128,7 +29892,6 @@ realclean: 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 \ @@ -29205,13 +29968,14 @@ realclean: Pluggable_Messaging_Utils.h \ $(ACE_ROOT)/ace/pre.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29294,7 +30058,6 @@ realclean: 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 \ @@ -29316,13 +30079,14 @@ realclean: Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29405,7 +30169,6 @@ realclean: 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 \ @@ -29501,13 +30264,14 @@ realclean: Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29590,7 +30354,6 @@ realclean: 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 \ @@ -29660,13 +30423,14 @@ realclean: Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29749,7 +30513,6 @@ realclean: 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 \ @@ -29900,6 +30663,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Leader_Follower.i @@ -29909,13 +30674,14 @@ realclean: GIOP_Message_Headers.h \ Tagged_Profile.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -29998,7 +30764,6 @@ realclean: 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 \ @@ -30306,6 +31071,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/GIOP_Message_Headers.o .obj/GIOP_Message_Headers.so .shobj/GIOP_Message_Headers.o .shobj/GIOP_Message_Headers.so: GIOP_Message_Headers.cpp \ @@ -30313,13 +31080,14 @@ realclean: $(ACE_ROOT)/ace/pre.h \ Tagged_Profile.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -30402,7 +31170,6 @@ realclean: 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 \ @@ -30778,6 +31545,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ @@ -31024,6 +31793,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ operation_details.h \ target_specification.h \ @@ -31052,13 +31823,14 @@ realclean: Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -31141,7 +31913,6 @@ realclean: 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 \ @@ -31272,19 +32043,22 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i .obj/Tagged_Profile.o .obj/Tagged_Profile.so .shobj/Tagged_Profile.o .shobj/Tagged_Profile.so: Tagged_Profile.cpp \ Tagged_Profile.h \ $(ACE_ROOT)/ace/pre.h \ IOPC.h \ - CDR.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -31367,7 +32141,6 @@ realclean: 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 \ @@ -31498,6 +32271,8 @@ realclean: Service_Callbacks.i \ Parser_Registry.h \ Parser_Registry.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ ORB_Core.i \ Acceptor_Registry.h \ Acceptor_Registry.i \ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index e661d761ffc..acd53b817ff 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -87,8 +87,7 @@ 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/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -179,7 +178,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - PortableServerC.h \ + RTPortableServerC.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -209,7 +208,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - Object_Adapter.h Key_Adapters.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 Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -258,19 +263,12 @@ CPPFLAGS += -I$(TAO_ROOT) Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(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 \ $(TAO_ROOT)/tao/LocalObject.h \ $(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/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -433,17 +431,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h 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 \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -471,6 +470,136 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableInterceptor.i \ $(TAO_ROOT)/tao/ORB.i +.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/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.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_Export.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/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.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/Based_Pointer_T.h \ + $(ACE_ROOT)/ace/Based_Pointer_T.i \ + $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(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/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/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(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/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 \ + $(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/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(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/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + $(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 + .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 \ @@ -496,9 +625,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -636,17 +764,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h 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 \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -716,6 +845,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -760,8 +891,7 @@ CPPFLAGS += -I$(TAO_ROOT) Forwarding_Servant.h .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 \ + Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \ portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -926,8 +1056,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.i .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/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1091,17 +1220,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h 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 \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -1196,6 +1326,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1232,8 +1364,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timeprobe.h .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/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1701,10 +1832,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyC.i \ $(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 $(ACE_ROOT)/ace/SString.h \ + poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i POAManager.i \ + POA.h $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i Object_Adapter.h \ Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -1747,18 +1877,18 @@ 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 \ - 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 \ - $(TAO_ROOT)/tao/Adapter.i \ + 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 \ - Object_Adapter.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 \ + $(TAO_ROOT)/tao/Adapter.i Object_Adapter.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i POA.i @@ -1929,8 +2059,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ Servant_Base.h Servant_Base.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + Active_Object_Map.i $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -2056,8 +2185,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - Servant_Base.i POA.h \ - $(ACE_ROOT)/ace/SString.h \ + Servant_Base.i POA.h $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i Object_Adapter.h \ Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ @@ -2100,17 +2228,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -2182,6 +2311,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -2228,9 +2359,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2368,17 +2498,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h 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 \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -2447,6 +2578,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -2558,8 +2691,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 \ - Object_Adapter.h Key_Adapters.h PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i Object_Adapter.h \ + Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -2631,17 +2764,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h 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 \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 @@ -2893,6 +3027,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2929,8 +3065,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3095,21 +3230,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 \ - poa_macros.h Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ + Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -3171,6 +3306,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/MProfile.h \ @@ -3376,13 +3513,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ + poa_macros.h RTPortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.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 \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i Operation_Table.h \ @@ -3435,6 +3573,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -3548,8 +3688,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 \ - Servant_Base.h PortableServerC.h portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.i Servant_Base.h \ + PortableServerC.h portableserver_export.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -3597,9 +3737,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/DomainC.i \ - Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(TAO_ROOT)/tao/DomainC.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 \ @@ -3642,13 +3781,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ + poa_macros.h RTPortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.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 \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i Operation_Table.h \ @@ -3723,6 +3863,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i @@ -3819,7 +3961,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - PortableServerC.h \ + RTPortableServerC.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -3849,7 +3991,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i PortableServerC.i \ - $(TAO_ROOT)/tao/ORB.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 $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -3858,16 +4006,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Request_Info.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.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 \ @@ -4024,8 +4168,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .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/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4257,6 +4400,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/NVList.h \ @@ -4409,9 +4554,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - PortableServerC.i Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i \ - ImplRepoS_T.cpp ImplRepoS.i Operation_Table.h \ + $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \ + Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \ + ImplRepoS.i Operation_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -4456,17 +4601,18 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.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/Server_Strategy_Factory.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 \ @@ -4541,6 +4687,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/GIOP_Server_Request.h \ @@ -4699,9 +4847,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ - Operation_Table.h \ + $(TAO_ROOT)/tao/MessagingC.i MessagingS_T.h \ + MessagingS_T.i MessagingS_T.cpp MessagingS.i Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -4751,13 +4898,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Map_T.i \ $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ - poa_macros.h Active_Object_Map.h \ + poa_macros.h RTPortableServerC.h \ + $(TAO_ROOT)/tao/RTCORBAC.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 \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/RTCORBAC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i \ @@ -4829,6 +4977,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i diff --git a/TAO/tao/SHMIOP_Profile.cpp b/TAO/tao/SHMIOP_Profile.cpp index a6f1cf1569c..bc1cf4e18b6 100644 --- a/TAO/tao/SHMIOP_Profile.cpp +++ b/TAO/tao/SHMIOP_Profile.cpp @@ -277,7 +277,37 @@ TAO_SHMIOP_Profile::parse_string (const char *string, tmp[length] = '\0'; this->endpoint_.host_ = tmp._retn (); + + ACE_INET_Addr host_addr; + if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0) + { + char tmp_host [MAXHOSTNAMELEN + 1]; + + // If no host is specified: assign the default host : the local host. + if (host_addr.get_host_name (tmp_host, + sizeof (tmp_host)) != 0) + { + const char *tmp = host_addr.get_host_addr (); + if (tmp == 0) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("\n\nTAO (%P|%t) ") + ACE_TEXT ("SHMIOP_Profile::parse_string ") + ACE_TEXT ("- %p\n\n"), + ACE_TEXT ("cannot determine hostname"))); + return -1; + } + else + this->endpoint_.host_ = tmp; + } + else + { + this->endpoint_.host_ = (const char *) tmp_host; + } + } + if (this->endpoint_.object_addr_.set (this->endpoint_.port_, this->endpoint_.host_.in ()) == -1) { @@ -288,6 +318,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string, ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed"))); } return -1; + } start = ++okd; // increment past the object key separator @@ -495,7 +526,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const #if (TAO_HAS_RT_CORBA == 1) // For now, use/transfer multiple endpoints per profile only with - // RTCORBA. + // RTCORBA. // Encode profile endpoints. TAO_SHMIOP_Profile *p = @@ -514,7 +545,7 @@ int TAO_SHMIOP_Profile::encode_endpoints (void) { // Create a data structure and fill it with endpoint info for wire - // transfer. + // transfer. // We include information for the head of the list // together with other endpoints because even though its addressing // info is transmitted using standard ProfileBody components, its @@ -557,7 +588,7 @@ TAO_SHMIOP_Profile::encode_endpoints (void) } // Add component with encoded endpoint data to this profile's - // TaggedComponents. + // TaggedComponents. tagged_components_.set_component (tagged_component); this->endpoints_encoded_ = 1; diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index c3dfa2aa775..c46a272924c 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -374,7 +374,7 @@ TAO_Default_Resource_Factory::get_parser_names (const char **&names, } // OK fallback on the hardcoded ones.... - this->parser_names_count_ = 2; /*HOW MANY DO WE HAVE?*/ + this->parser_names_count_ = 3; /*HOW MANY DO WE HAVE?*/ // @@ this->parser_names_count_ should later be changed to 4 when // activating CORBALOC and CORBANAME Parsers. @@ -430,28 +430,29 @@ TAO_Default_Resource_Factory::get_parser_names (const char **&names, index++; } - /* + // CORBALOC_Parser tmp = ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("CORBALOC_Parser"); - + if (tmp == 0) { int r = ACE_Service_Config::process_directive ( - "dynamic CORBALOC_Parser Service_Object * TAO_IOR_CORBALOC:_make_TAO_CORBALOC_Parser()" + "dynamic CORBALOC_Parser Service_Object * TAO:_make_TAO_CORBALOC_Parser()" ); - + if (r != 0) { ACE_ERROR_RETURN ((LM_ERROR, "Error Configuring CORBALOC Parser\n"), -1); } } - + this->parser_names_[index] = "CORBALOC_Parser"; index++; - + + /* // CORBANAME_Parser tmp = ACE_Dynamic_Service<TAO_IOR_Parser>::instance ("CORBANAME_Parser"); diff --git a/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp b/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp deleted file mode 100644 index a67b51f1ad9..00000000000 --- a/TAO/tao/ior_corbaloc/CORBALOC_Parser.cpp +++ /dev/null @@ -1,453 +0,0 @@ -// $Id$ - -#include "CORBALOC_Parser.h" -#include "tao/Object_Loader.h" -#include "tao/Object.h" -#include "tao/ORB.h" -#include "tao/Exception.h" -#include "tao/Environment.h" -#include "ace/Read_Buffer.h" - -#if !defined(__ACE_INLINE__) -#include "CORBALOC_Parser.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(tao, CORBALOC_Parser, "$Id$") - -TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) -{ -} - -static const char corbaloc_prefix[] = "corbaloc:"; - -int -TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const -{ - return (ACE_OS::strncmp (ior_string, - corbaloc_prefix, - sizeof corbaloc_prefix - 1) == 0); -} - -void -TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name, - CORBA::ULong &addr_list_length, - CORBA::ULong - &count_addr, - CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - CORBA::Boolean start_key_string = 1; - - for (const char *i = corbaloc_name; *i != '\0'; ++i) - { - if (*i == ',') - { - // Increment the count of the addresses in the list - ++count_addr; - } - - if (*i == '/') - { - if (*(i+1) == '/') - { - ++i; - ++addr_list_length; - } - else if (*(i+1) != '/') - { - // Indication that the next characters are to be - // assigned to key_string - start_key_string = 0; - } - } - - if (start_key_string == 1) - { - ++addr_list_length; - } - } - -} - -void -TAO_CORBALOC_Parser::assign_iiop_prefix_key_string (ACE_Array_Base <char *> &addr, - char * &cloc_name_ptr, - ACE_CString &key_string, - CORBA::ULong ¤t_addr, - CORBA::ULong &addr_list_length) -{ - - // If there is no port number specified, append the default port - // number i.e. 2809. - char *port_seperator = ACE_OS::strchr (cloc_name_ptr, - ':'); - - const char iiop_prefix[] = "iiop:"; - - if (port_seperator == 0) - { - // Implies that there is no seperator - // append the default port - - // @@ Priyanka: this should be a macro or something, the - // application developer may like another default. Or worse, it - // could be changed, in fact, the standard port is (I believe) - // 683. - - const char def_port [] = ":2809"; - - // Allocation of memory - addr [current_addr] = - CORBA::string_alloc (addr_list_length + - sizeof (iiop_prefix) + - sizeof (def_port) + - key_string.length ()); - - // If there is no explicit protocol specified, prepend the - // default "iiop:" - ACE_OS::strcpy (addr [current_addr], - iiop_prefix); - - ACE_OS::strcat (addr [current_addr], - cloc_name_ptr); - - // Append the def_port - ACE_OS::strcat (addr [current_addr], - def_port); - } - else - { - // If there is no explicit protocol specified, prepend the - // default "iiop:" - - // Allocation of memory - addr [current_addr] = - CORBA::string_alloc (addr_list_length + - sizeof (iiop_prefix) + - key_string.length ()); - - ACE_OS::strcpy (addr [current_addr], - iiop_prefix); - - ACE_OS::strcat (addr [current_addr], - cloc_name_ptr); - } - -} - -void -TAO_CORBALOC_Parser::assign_key_string (ACE_Array_Base <char *> &addr, - char * &cloc_name_ptr, - ACE_CString &key_string, - CORBA::ULong ¤t_addr, - CORBA::ULong &addr_list_length) -{ - - // If there is no port number specified, append the default port - // number i.e. 2809. - char *port_seperator = ACE_OS::strrchr (cloc_name_ptr, - ':'); - - if (*(port_seperator+1) == '/') - { - // Implies that there is no seperator - // append the default port - const char def_port [] = ":2809"; - - // Allocation of memory - addr [current_addr] = - CORBA::string_alloc (addr_list_length + - sizeof (def_port) + - key_string.length ()); - - ACE_OS::strcpy (addr [current_addr], - cloc_name_ptr); - - // Append the default port. - ACE_OS::strcat (addr [current_addr], - def_port); - } - else - { - // Allocation of memory - addr [current_addr] = - CORBA::string_alloc (addr_list_length + - key_string.length ()); - - // If the protocol is <iiop:> - ACE_OS::strcpy (addr [current_addr], - cloc_name_ptr); - - } -} - -void -TAO_CORBALOC_Parser::parse_string_assign_helper (ACE_Array_Base <char *> &addr, - CORBA::ULong &addr_list_length, - ACE_CString &key_string, - ACE_CString &cloc_name, - CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - char *cloc_name_ptr = 0; - CORBA::ULong current_addr = 0; - - // Tokenize using "," as the seperator - char *last_addr = 0; - cloc_name_ptr = ACE_OS::strtok_r (ACE_const_cast (char *, cloc_name.c_str ()), - ",", - &last_addr); - - const char iiop_prefix[] = "iiop:"; - - while (cloc_name_ptr != 0) - { - // Loop till we get all the endpoints. - if (ACE_OS::strncmp (cloc_name_ptr, - iiop_prefix, - sizeof (iiop_prefix)-1) != 0) - { - assign_iiop_prefix_key_string (addr, - cloc_name_ptr, - key_string, - current_addr, - addr_list_length); - } - else - { - assign_key_string (addr, - cloc_name_ptr, - key_string, - current_addr, - addr_list_length); - } - - ACE_OS::strcat (addr [current_addr], - key_string.c_str ()); - - ++current_addr; - // Get the next token. - cloc_name_ptr = ACE_OS::strtok_r (NULL, - ",", - &last_addr); - } -} - - -CORBA::Object_ptr -TAO_CORBALOC_Parser::parse_string_mprofile_helper (ACE_Array_Base <char *> &addr, - CORBA::ULong &count_addr, - CORBA::ORB_ptr orb, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - // Make one MProfile for all of these endpoints - TAO_MProfile mprofile; - - CORBA::Object_ptr obj = CORBA::Object::_nil (); - - for (CORBA::ULong j = 0; j != count_addr; ++j) - { - TAO_MProfile jth_mprofile; - // = new TAO_MProfile; - - int retv = - orb->orb_core ()->connector_registry ()->make_mprofile (addr [j], - jth_mprofile, - ACE_TRY_ENV); - - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Return nil. - - if (retv != 0) - { - ACE_THROW_RETURN (CORBA::INV_OBJREF ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - EINVAL), - CORBA::COMPLETED_NO), - CORBA::Object::_nil ()); - } - - // Add this profile to the main mprofile. - TAO_MProfile *jth_mprofile_ptr = &jth_mprofile; - - int result = mprofile.add_profiles (jth_mprofile_ptr); - - if (result == -1) - { - // The profle is not added. Either ways, go to the - // next endpoint. - } - } - - // Now make the TAO_Stub. - TAO_Stub *data = 0; - ACE_NEW_THROW_EX (data, - TAO_Stub ((char *) 0, mprofile, - orb->orb_core ()), - CORBA::NO_MEMORY ( - CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - TAO_Stub_Auto_Ptr safe_data (data); - - obj = orb->orb_core ()->create_object (data); - if (!CORBA::is_nil (obj)) - { - // All is well, so release the stub object from its - // auto_ptr. - (void) safe_data.release (); - - // and return the object reference to the application. - return obj; - } - - - return CORBA::Object::_nil (); -} - -CORBA::Object_ptr -TAO_CORBALOC_Parser::parse_string_rir_helper (const char * - &corbaloc_name, - CORBA::ORB_ptr orb, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - const char rir_prefix [] = "rir:/"; - CORBA::Object_ptr rir_obj = CORBA::Object::_nil (); - - // "rir" protocol. Pass the key string as an - // argument to the resolve_initial_references () - const char *key_string = - corbaloc_name + sizeof (rir_prefix) -1; - - if (ACE_OS::strcmp (key_string, "") == 0) - { - // If the key string is empty, assume the default - // "NameService". - key_string = "NameService"; - } - - rir_obj = orb->resolve_initial_references (key_string, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return rir_obj; -} - -int -TAO_CORBALOC_Parser::check_prefix (const char *endpoint) -{ - - // Check for a valid string - if (!endpoint || !*endpoint) - return -1; // Failure - - const char *protocol[] = { "iiop:", "" }; - - size_t slot = ACE_OS::strchr (endpoint, '/') - endpoint; - - size_t len0 = ACE_OS::strlen (protocol[0]); - size_t len1 = ACE_OS::strlen (protocol[1]); - - // Check for the proper prefix in the IOR. If the proper prefix - // isn't in the IOR then it is not an IOR we can use. - if (slot == len0 - && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0) - return 0; - else if (slot == len1 - && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0) - return 0; - - return -1; - // Failure: not an IIOP IOR - // DO NOT throw an exception here. -} - -CORBA::Object_ptr -TAO_CORBALOC_Parser::parse_string (const char *ior, - CORBA::ORB_ptr orb, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - - // Skip the prefix, we know it is there because this method in only - // called if <match_prefix> returns 1. - const char *corbaloc_name = - ior + sizeof corbaloc_prefix - 1; - - CORBA::Object_ptr object = CORBA::Object::_nil (); - - // No of endpoints - CORBA::ULong count_addr = 1; - - // Length of obj_addr_list - CORBA::ULong addr_list_length = 0; - - // If the protocol is "iiop:", - if (this->check_prefix (corbaloc_name) == 0) - { - // Count the length of the obj_addr_list and number of - // endpoints in the obj_addr_list - this->parse_string_count_helper (corbaloc_name, - addr_list_length, - count_addr, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - // Convert corbaloc_name as a ACE_CString - ACE_CString corbaloc_name_str (corbaloc_name, 0, 1); - - // Get the key_string which is a substring of corbaloc_name_str - ACE_CString key_string = corbaloc_name_str.substring (addr_list_length, -1); - - // Array of <obj_addr> - ACE_Array_Base<char*> addr (count_addr); - - // Copy the <obj_addr_list> to cloc_name. - ACE_CString cloc_name (corbaloc_name, - addr_list_length, - 0, - 1); - - // Assign the <obj_addr> to the array elements - this->parse_string_assign_helper (addr, - addr_list_length, - key_string, - cloc_name, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - // Get the Ptr to the NameService - object = this->parse_string_mprofile_helper (addr, - count_addr, - orb, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - } - else - { - // RIR case: - object = this->parse_string_rir_helper (corbaloc_name, - orb, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - } - - return object; -} - - -ACE_FACTORY_DEFINE (TAO_IOR_CORBALOC, TAO_CORBALOC_Parser) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base<char *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -pragma instantiate ACE_Array_Base<char *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ior_corbaloc/ior_corbaloc_export.h b/TAO/tao/ior_corbaloc_export.h index 501e2e53530..501e2e53530 100644 --- a/TAO/tao/ior_corbaloc/ior_corbaloc_export.h +++ b/TAO/tao/ior_corbaloc_export.h |