diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp | 203 |
1 files changed, 103 insertions, 100 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp index d3b5c62b869..6209778f37c 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp @@ -16,27 +16,27 @@ class DP_Adapter : public TAO_Dynamic_Property public: DP_Adapter (const char* prop_name, - CosPropertyService::PropertySet_ptr prop_set); + CosPropertyService::PropertySet_ptr prop_set); ~DP_Adapter (void); - + virtual CORBA::Any* evalDP (const char* name, CORBA::TypeCode_ptr returned_type, const CORBA::Any& extra_info, - CORBA::Environment& TAO_IN_ENV) + CORBA::Environment& TAO_IN_ENV) TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // Call back to the Property Service interface. The Property // Service reference is contained in the extra_info -- an // Asynchronous Completion Token. - + private: - + const char* prop_name_; CosPropertyService::PropertySet_var prop_set_; }; DP_Adapter::DP_Adapter (const char* prop_name, - CosPropertyService::PropertySet_ptr prop_set) + CosPropertyService::PropertySet_ptr prop_set) : prop_name_ (prop_name), prop_set_ (prop_set) { @@ -50,23 +50,23 @@ CORBA::Any* DP_Adapter::evalDP (const char* name, CORBA::TypeCode_ptr returned_type, const CORBA::Any& extra_info, - CORBA::Environment& TAO_IN_ENV) + CORBA::Environment& TAO_IN_ENV) TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { TAO_TRY { CORBA::Any* return_value = - this->prop_set_->get_property_value (this->prop_name_, - TAO_TRY_ENV); + this->prop_set_->get_property_value (this->prop_name_, + TAO_TRY_ENV); TAO_CHECK_ENV; - + return return_value; } TAO_CATCHANY { TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure - (this->prop_name_, returned_type, extra_info), - 0); + (this->prop_name_, returned_type, extra_info), + 0); } TAO_ENDTRY; } @@ -77,8 +77,8 @@ DP_Adapter::evalDP (const char* name, TAO_Property_Exporter:: TAO_Property_Exporter (CosTrading::Lookup_var lookup_if, - CosPropertyService::PropertySet_ptr prop_set, - CORBA::ULong initial_size) + CosPropertyService::PropertySet_ptr prop_set, + CORBA::ULong initial_size) : increment_ (initial_size), lookup_ (lookup_if), prop_set_ (prop_set), @@ -95,11 +95,11 @@ TAO_Property_Exporter::~TAO_Property_Exporter (void) void TAO_Property_Exporter::add_static_property (const char* name, - const CORBA::Any& value) + const CORBA::Any& value) { CORBA::ULong plength = this->pprops_.length (), tlength = this->tprops_.length (); - + if (tlength == this->tcount_) this->tprops_.length (tlength + this->increment_); @@ -121,8 +121,8 @@ TAO_Property_Exporter::add_static_property (const char* name, void TAO_Property_Exporter:: add_dynamic_property (const char* name, - const CORBA::Any& value, - TAO_Dynamic_Property& dynamic_prop) + const CORBA::Any& value, + TAO_Dynamic_Property& dynamic_prop) { // Add a property to the PropSet and a dynamic property to the // Offer. Have the dynamic property connect to the PropSet accessor @@ -132,7 +132,7 @@ add_dynamic_property (const char* name, CORBA::ULong plength = this->pprops_.length (), tlength = this->tprops_.length (); - + if (tlength == this->tcount_) this->tprops_.length (tlength + this->increment_); @@ -143,12 +143,12 @@ add_dynamic_property (const char* name, CosTradingDynamic::DynamicProp_var dp_struct = dynamic_prop.construct_dynamic_prop (name, value.type (), extra_info); - + // Copy the dynamic property struct into the property value this->tprops_[this->tcount_].name = name; this->tprops_[this->tcount_].value <<= dp_struct.in (); this->tcount_++; - + this->pprops_[this->pcount_].property_name = name; this->pprops_[this->pcount_].property_value = value; this->pcount_++; @@ -157,10 +157,10 @@ add_dynamic_property (const char* name, void TAO_Property_Exporter:: add_dynamic_property (const char* name, - CosTradingDynamic::DynamicProp& dp_struct) + CosTradingDynamic::DynamicProp& dp_struct) { CORBA::ULong tlength = this->tprops_.length (); - + if (tlength == this->tcount_) this->tprops_.length (tlength + this->increment_); @@ -172,10 +172,10 @@ add_dynamic_property (const char* name, void TAO_Property_Exporter:: add_dynamic_property (const char* name, - CosTradingDynamic::DynamicProp* dp_struct) + CosTradingDynamic::DynamicProp* dp_struct) { CORBA::ULong tlength = this->tprops_.length (); - + if (tlength == this->tcount_) this->tprops_.length (tlength + this->increment_); @@ -186,19 +186,19 @@ add_dynamic_property (const char* name, CosTrading::OfferId -TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, - const CosTrading::ServiceTypeName type, - CORBA::Environment& TAO_IN_ENV) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::Register::InvalidObjectRef, - CosTrading::IllegalServiceType, - CosTrading::UnknownServiceType, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) +TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref, + const CosTrading::ServiceTypeName type, + CORBA::Environment& TAO_IN_ENV) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTrading::Register::InvalidObjectRef, + CosTrading::IllegalServiceType, + CosTrading::UnknownServiceType, + CosTrading::Register::InterfaceTypeMismatch, + CosTrading::IllegalPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::MissingMandatoryProperty, + CosTrading::DuplicatePropertyName)) { CosTrading::Register_var reg = this->lookup_->register_if (TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); @@ -206,39 +206,39 @@ TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, // Export the offer to the trader under the given type. CosTrading::OfferId offer_id = 0; this->tprops_.length (this->tcount_); - offer_id = reg->export (object_ref, type, this->tprops_, TAO_IN_ENV); + offer_id = reg->_cxx_export (object_ref, type, this->tprops_, TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); this->pprops_.length (this->pcount_); this->prop_set_->define_properties (this->pprops_, TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, offer_id); - + return offer_id; } - + CosTrading::OfferId -TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, - const CosTrading::ServiceTypeName type, - const TRADING_REPOS::PropStructSeq& props, - const TRADING_REPOS::ServiceTypeNameSeq& stypes, - CORBA::Environment& TAO_IN_ENV) +TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref, + const CosTrading::ServiceTypeName type, + const TRADING_REPOS::PropStructSeq& props, + const TRADING_REPOS::ServiceTypeNameSeq& stypes, + CORBA::Environment& TAO_IN_ENV) TAO_THROW_SPEC ((CORBA::SystemException, - CosTrading::IllegalServiceType, - TRADING_REPOS::ServiceTypeExists, - TRADING_REPOS::InterfaceTypeMismatch, - CosTrading::IllegalPropertyName, - CosTrading::DuplicatePropertyName, - TRADING_REPOS::ValueTypeRedefinition, - TRADING_REPOS::DuplicateServiceTypeName, - CosTrading::Register::InvalidObjectRef, - CosTrading::Register::InterfaceTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::MissingMandatoryProperty, - CosTrading::DuplicatePropertyName)) + CosTrading::IllegalServiceType, + TRADING_REPOS::ServiceTypeExists, + TRADING_REPOS::InterfaceTypeMismatch, + CosTrading::IllegalPropertyName, + CosTrading::DuplicatePropertyName, + TRADING_REPOS::ValueTypeRedefinition, + TRADING_REPOS::DuplicateServiceTypeName, + CosTrading::Register::InvalidObjectRef, + CosTrading::Register::InterfaceTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::MissingMandatoryProperty, + CosTrading::DuplicatePropertyName)) { CosTrading::Register_var reg; CosTrading::OfferId offer_id = 0; - + TAO_TRY { reg = this->lookup_->register_if (TAO_TRY_ENV); @@ -249,35 +249,38 @@ TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, TAO_CHECK_ENV; - + /***************** UTTER HACK: REMOVE WHEN EXCEPTIONS WORK! **** CosTrading::TypeRepository_ptr obj = this->lookup_->type_repos (_env); ACE_DEBUG ((LM_DEBUG, "Attempting add_type.\n")); CosTradingRepos::ServiceTypeRepository_var str = - CosTradingRepos::ServiceTypeRepository::_narrow (obj, _env); + CosTradingRepos::ServiceTypeRepository::_narrow (obj, _env); TAO_CHECK_ENV_RETURN (_env, 0); - + str->add_type (type, - object_ref->_interface_repository_id (), - props, - stypes, + object_ref->_interface_repository_id (), + props, + stypes, - _env); - TAO_CHECK_ENV_RETURN (_env, 0); + _env); + TAO_CHECK_ENV_RETURN (_env, 0); ***************** UTTER HACK: REMOVE WHEN EXCEPTIONS WORK! ****/ - + // Attempt to export the offer. ACE_DEBUG ((LM_DEBUG, "Attempting export.\n")); this->tprops_.length (this->tcount_); - offer_id = reg->export (object_ref, type, this->tprops_, TAO_TRY_ENV); + offer_id = reg->_cxx_export (object_ref, + type, + this->tprops_, + TAO_TRY_ENV); TAO_CHECK_ENV; } - TAO_CATCH (CosTrading::UnknownServiceType, excp) - { + TAO_CATCH (CosTrading::UnknownServiceType, excp) + { cout<<"Within the UnknownServiceType exception"<<endl; @@ -286,23 +289,26 @@ TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, ACE_DEBUG ((LM_DEBUG, "Export failed. Attempting add_type.\n")); CosTradingRepos::ServiceTypeRepository_var str = - CosTradingRepos::ServiceTypeRepository::_narrow (obj, TAO_IN_ENV); + CosTradingRepos::ServiceTypeRepository::_narrow (obj, TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); - + // If the ServiceTypeName wasn't found, we'll have to add the // type to the Service Type repository ourselves. str->add_type (type, - object_ref->_interface_repository_id (), - props, - stypes, - TAO_IN_ENV); + object_ref->_interface_repository_id (), + props, + stypes, + TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); // Now we'll try again to register the offer. ACE_DEBUG ((LM_DEBUG, "Attempting export again.\n")); this->tprops_.length (this->tcount_); - offer_id = reg->export (object_ref, type, this->tprops_, TAO_IN_ENV); + offer_id = reg->_cxx_export (object_ref, + type, + this->tprops_, + TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); cout<<"It reached here"<<endl; @@ -312,7 +318,7 @@ TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, { // Sigh, all our efforts were for naight. TAO_RETHROW_RETURN (0); - } + } */ TAO_ENDTRY; @@ -325,8 +331,8 @@ TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref, TAO_Property_Modifier:: TAO_Property_Modifier (CosTrading::Lookup_var lookup_if, - CosPropertyService::PropertySet_ptr prop_set, - CORBA::ULong initial_size) + CosPropertyService::PropertySet_ptr prop_set, + CORBA::ULong initial_size) : increment_ (initial_size), lookup_ (lookup_if), prop_set_ (prop_set), @@ -346,7 +352,7 @@ TAO_Property_Modifier::delete_property (const char* name) { CORBA::ULong plength = this->pdelete_.length (), tlength = this->tdelete_.length (); - + if (tlength == this->tdcount_) this->tdelete_.length (tlength + this->increment_); @@ -365,7 +371,7 @@ TAO_Property_Modifier::modify_property (const char* name, const Any& value) { CORBA::ULong plength = this->pmodify_.length (), tlength = this->tmodify_.length (); - + if (tlength == this->tmcount_) this->tmodify_.length (tlength + this->increment_); @@ -383,20 +389,20 @@ TAO_Property_Modifier::modify_property (const char* name, const Any& value) void TAO_Property_Modifier::commit (CosTrading::OfferId id, - CORBA::Environment& TAO_IN_ENV) + CORBA::Environment& TAO_IN_ENV) TAO_THROW_SPEC ((CORBA::SystemException, - CosPropertyService::MultipleExceptions, - CosTrading::NotImplemented, - CosTrading::IllegalOfferId, - CosTrading::UnknownOfferId, - CosTrading::Register::ProxyOfferId, - CosTrading::IllegalPropertyName, - CosTrading::Register::UnknownPropertyName, - CosTrading::PropertyTypeMismatch, - CosTrading::ReadonlyDynamicProperty, - CosTrading::Register::MandatoryProperty, - CosTrading::Register::ReadonlyProperty, - CosTrading::DuplicatePropertyName)) + CosPropertyService::MultipleExceptions, + CosTrading::NotImplemented, + CosTrading::IllegalOfferId, + CosTrading::UnknownOfferId, + CosTrading::Register::ProxyOfferId, + CosTrading::IllegalPropertyName, + CosTrading::Register::UnknownPropertyName, + CosTrading::PropertyTypeMismatch, + CosTrading::ReadonlyDynamicProperty, + CosTrading::Register::MandatoryProperty, + CosTrading::Register::ReadonlyProperty, + CosTrading::DuplicatePropertyName)) { this->tdelete_.length (this->tdcount_); this->tmodify_.length (this->tmcount_); @@ -405,7 +411,7 @@ TAO_Property_Modifier::commit (CosTrading::OfferId id, CosTrading::Register_var reg = this->lookup_->register_if (TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV,); - + reg->modify (id, this->tdelete_, this->tmodify_, TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV,); @@ -415,6 +421,3 @@ TAO_Property_Modifier::commit (CosTrading::OfferId id, this->prop_set_->delete_properties (this->pdelete_, TAO_IN_ENV); TAO_CHECK_ENV_RETURN (TAO_IN_ENV,); } - - - |