From bfe0feee006a1b9b0d8b5a2148474f6e59b7e592 Mon Sep 17 00:00:00 2001 From: wilson_d Date: Thu, 4 Dec 2003 15:57:33 +0000 Subject: ChangeLogTag: Thu Dec 4 09:56:12 2003 Dale Wilson --- TAO/ChangeLog | 9 +++++++ .../Factory_Service/EventChannelFactory_i.cpp | 28 +++++++++++----------- .../Factory_Service/EventChannelFactory_i.h | 24 +++++++++---------- .../orbsvcs/PortableGroup/PG_ObjectGroupManager.h | 2 +- .../GroupRef_Manipulation/server.cpp | 2 +- .../FaultTolerance/IOGRManipulation/IOGRTest.cpp | 6 ++--- 6 files changed, 40 insertions(+), 31 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 08a563e8540..4435f1de167 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Dec 4 09:56:12 2003 Dale Wilson + + * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h: + * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp: + Build problems due to change in TagGroupTaggedComponent structure. + Thu Dec 4 08:19:26 2003 Dale Wilson * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index e866050e703..0cf755006bc 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -23,17 +23,17 @@ EventChannelFactory_i::EventChannelFactory_i(const char* conf_filename, CORBA::O CORBA::Object_ptr EventChannelFactory_i::create_object ( const char * type_id, - const FT::Criteria & the_criteria, - FT::GenericFactory::FactoryCreationId_out factory_creation_id + const PortableGroup::Criteria & the_criteria, + PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException - , FT::NoFactory - , FT::ObjectNotCreated - , FT::InvalidCriteria - , FT::InvalidProperty - , FT::CannotMeetCriteria + , PortableGroup::NoFactory + , PortableGroup::ObjectNotCreated + , PortableGroup::InvalidCriteria + , PortableGroup::InvalidProperty + , PortableGroup::CannotMeetCriteria )) { @@ -41,7 +41,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( FILE* file = fopen(conf_file, "r"); if (file == NULL) - ACE_THROW_RETURN(FT::NoFactory(), CORBA::Object::_nil()); + ACE_THROW_RETURN(PortableGroup::NoFactory(), CORBA::Object::_nil()); ScopeGuard file_guard = MakeGuard(fclose, file); ACE_UNUSED_ARG(file_guard); @@ -64,16 +64,16 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( } } - ACE_THROW_RETURN(FT::ObjectNotCreated(), CORBA::Object::_nil()); + ACE_THROW_RETURN(PortableGroup\::ObjectNotCreated(), CORBA::Object::_nil()); } void EventChannelFactory_i::delete_object ( - const FT::GenericFactory::FactoryCreationId & factory_creation_id + const PortableGroup\::GenericFactory::FactoryCreationId & factory_creation_id ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException - , FT::ObjectNotFound + , PortableGroup\::ObjectNotFound )) { ACE_TRACE("EventChannelFactory_i::delete_object"); @@ -88,8 +88,8 @@ void EventChannelFactory_i::delete_object ( CORBA::Object_ptr EventChannelFactory_i::create_process ( char * process_str, - const FT::Criteria & the_criteria, - FT::GenericFactory::FactoryCreationId_out factory_creation_id) + const PortableGroup\::Criteria & the_criteria, + PortableGroup\::GenericFactory::FactoryCreationId_out factory_creation_id) { ACE_TRACE("EventChannelFactory_i::create_process"); @@ -98,7 +98,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( // fill the factory_creation_id ACE_NEW_RETURN(factory_creation_id, - FT::GenericFactory::FactoryCreationId, + PortableGroup\::GenericFactory::FactoryCreationId, CORBA::Object::_nil()); *factory_creation_id <<= (CORBA::ULong) ++id; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h index 28a1c8f668e..656df7363bf 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h @@ -21,39 +21,39 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class EventChannelFactory_i : public POA_FT::GenericFactory { +class EventChannelFactory_i : public POA_PortableGroup::GenericFactory { public: EventChannelFactory_i(const char* conf_filename, CORBA::ORB_ptr); virtual CORBA::Object_ptr create_object ( const char * type_id, - const FT::Criteria & the_criteria, - FT::GenericFactory::FactoryCreationId_out factory_creation_id + const PortableGroup::Criteria & the_criteria, + PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException - , FT::NoFactory - , FT::ObjectNotCreated - , FT::InvalidCriteria - , FT::InvalidProperty - , FT::CannotMeetCriteria + , PortableGroup::NoFactory + , PortableGroup::ObjectNotCreated + , PortableGroup::InvalidCriteria + , PortableGroup::InvalidProperty + , PortableGroup::CannotMeetCriteria )) ; virtual void delete_object ( - const FT::GenericFactory::FactoryCreationId & factory_creation_id + const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException - , FT::ObjectNotFound + , PortableGroup::ObjectNotFound )); private: CORBA::Object_ptr create_process ( char * process, - const FT::Criteria & the_criteria, - FT::GenericFactory::FactoryCreationId_out factory_creation_id); + const PortableGroup::Criteria & the_criteria, + PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id); const char* conf_file; int id; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 3133a95ad2c..947aa585a71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -150,7 +150,7 @@ public: CORBA::SystemException , PortableGroup::ObjectGroupNotFound )); - + //@} /// TAO-specific member addition method. diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 3e5f675d6ab..39377976734 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -67,7 +67,7 @@ add_ft_prop (CORBA::ORB_ptr o, // Domain id const char *id = "version_testing"; - ft_tag_component.ft_domain_id = id; + ft_tag_component.group_domain_id = id; // Object group id ft_tag_component.object_group_id = diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 1fee2721fe0..bee0a99a33e 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -142,12 +142,12 @@ main (int argc, char *argv[]) // Property values // Major and Minor revision numbers - ft_tag_component.version.major = (CORBA::Octet) 1; - ft_tag_component.version.minor = (CORBA::Octet) 0; + ft_tag_component.component_version.major = (CORBA::Octet) 1; + ft_tag_component.component_version.minor = (CORBA::Octet) 0; // Domain id const char *id = "iogr_regression"; - ft_tag_component.ft_domain_id = id; + ft_tag_component.group_domain_id = id; // Object group id ft_tag_component.object_group_id = -- cgit v1.2.1