diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp | 199 |
1 files changed, 120 insertions, 79 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 104801b9ff1..9167de414fb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -4,14 +4,19 @@ #include "Repository_i.h" #include "HomeDef_i.h" -ACE_RCSID(IFR_Service, HomeDef_i, "$Id$") +ACE_RCSID (IFRService, + HomeDef_i, + "$Id$") TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) : TAO_IRObject_i (repo), TAO_Container_i (repo), TAO_Contained_i (repo), TAO_IDLType_i (repo), + TAO_ExtInterfaceDef_i (repo), + TAO_InterfaceAttrExtension_i (repo), TAO_InterfaceDef_i (repo) + { } @@ -85,19 +90,19 @@ TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PA return 0; } -IR::HomeDef_ptr +CORBA::ComponentIR::HomeDef_ptr TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::HomeDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -IR::HomeDef_ptr +CORBA::ComponentIR::HomeDef_ptr TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -105,139 +110,175 @@ TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_A return 0; } -IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL) +void +TAO_HomeDef_i::base_home ( + CORBA::ComponentIR::HomeDef_ptr base_home + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); + TAO_IFR_WRITE_GUARD; this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::ComponentDef::_nil ()); + ACE_CHECK; - return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->base_home_i (base_home + ACE_ENV_ARG_PARAMETER); } -IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_HomeDef_i::base_home_i ( + CORBA::ComponentIR::HomeDef_ptr base_home + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; } -IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +CORBA::InterfaceDefSeq * +TAO_HomeDef_i::supported_interfaces ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (0); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::PrimaryKeyDef::_nil ()); + ACE_CHECK_RETURN (0); - return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } - -IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) - ACE_THROW_SPEC ((CORBA::SystemException)) + +CORBA::InterfaceDefSeq * +TAO_HomeDef_i::supported_interfaces_i ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; -} +} -IR::FactoryDefSeq * -TAO_HomeDef_i::factories (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +void +TAO_HomeDef_i::supported_interfaces ( + const CORBA::InterfaceDefSeq &supported_interfaces + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (0); + TAO_IFR_WRITE_GUARD; this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return this->factories_i (ACE_ENV_SINGLE_ARG_PARAMETER); -} + ACE_CHECK; -IR::FactoryDefSeq * -TAO_HomeDef_i::factories_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) - ACE_THROW_SPEC ((CORBA::SystemException)) + this->supported_interfaces_i (supported_interfaces + ACE_ENV_SINGLE_ARG_PARAMETER); +} + +void +TAO_HomeDef_i::supported_interfaces_i ( + const CORBA::InterfaceDefSeq &supported_interfaces + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; } - -IR::FinderDefSeq * -TAO_HomeDef_i::finders (ACE_ENV_SINGLE_ARG_DECL) + +CORBA::ComponentIR::ComponentDef_ptr +TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (0); + TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); - return this->finders_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -IR::FinderDefSeq * -TAO_HomeDef_i::finders_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +CORBA::ComponentIR::ComponentDef_ptr +TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA::Boolean -TAO_HomeDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL) +void +TAO_HomeDef_i::managed_component ( + CORBA::ComponentIR::ComponentDef_ptr managed_component + ACE_ENV_ARG_DECL + ) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_READ_GUARD_RETURN (0); + TAO_IFR_WRITE_GUARD; this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_CHECK; - return this->is_basic_i (ACE_ENV_SINGLE_ARG_PARAMETER); + this->managed_component_i (managed_component + ACE_ENV_ARG_PARAMETER); } -CORBA::Boolean -TAO_HomeDef_i::is_basic_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_HomeDef_i::managed_component_i ( + CORBA::ComponentIR::ComponentDef_ptr managed_component + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ + ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; } -IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::create_primary_key (const char *id, - const char *name, - const char *version, - CORBA::ValueDef_ptr primary_key - ACE_ENV_ARG_DECL) +CORBA::ValueDef_ptr +TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); + TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ValueDef::_nil ()); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::PrimaryKeyDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ComponentIR::ValueDef::_nil ()); - return this->create_primary_key_i (id, - name, - version, - primary_key - ACE_ENV_ARG_PARAMETER); + return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::create_primary_key_i (const char * /* id */, - const char * /* name */, - const char * /* version */, - CORBA::ValueDef_ptr /* primary_key */ - ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) +CORBA::ValueDef_ptr +TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -IR::FactoryDef_ptr +void +TAO_HomeDef_i::primary_key ( + CORBA::ValueDef_ptr primary_key + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + TAO_IFR_WRITE_GUARD; + + this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + this->primary_key_i (primary_key + ACE_ENV_SINGLE_ARG_PARAMETER); +} + +void +TAO_HomeDef_i::primary_key_i ( + CORBA::ValueDef_ptr primary_key + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // TODO +} + +CORBA::ComponentIR::FactoryDef_ptr TAO_HomeDef_i::create_factory (const char *id, const char *name, const char *version, @@ -246,10 +287,10 @@ TAO_HomeDef_i::create_factory (const char *id, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ()); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::FactoryDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ComponentIR::FactoryDef::_nil ()); return this->create_factory_i (id, name, @@ -259,7 +300,7 @@ TAO_HomeDef_i::create_factory (const char *id, ACE_ENV_ARG_PARAMETER); } -IR::FactoryDef_ptr +CORBA::ComponentIR::FactoryDef_ptr TAO_HomeDef_i::create_factory_i ( const char * /* id */, const char * /* name */, @@ -274,7 +315,7 @@ TAO_HomeDef_i::create_factory_i ( return 0; } -IR::FinderDef_ptr +CORBA::ComponentIR::FinderDef_ptr TAO_HomeDef_i::create_finder (const char *id, const char *name, const char *version, @@ -283,10 +324,10 @@ TAO_HomeDef_i::create_finder (const char *id, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ()); + TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ()); this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (IR::FinderDef::_nil ()); + ACE_CHECK_RETURN (CORBA::ComponentIR::FinderDef::_nil ()); return this->create_finder_i (id, name, @@ -296,7 +337,7 @@ TAO_HomeDef_i::create_finder (const char *id, ACE_ENV_ARG_PARAMETER); } -IR::FinderDef_ptr +CORBA::ComponentIR::FinderDef_ptr TAO_HomeDef_i::create_finder_i ( const char * /* id */, const char * /* name */, |