diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Trading')
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp | 112 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Exporter.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Importer.cpp | 49 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Importer.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp | 107 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Simple_Dynamic.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/TT_Info.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/TT_Info.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/colocated_test.cpp | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/export_test.cpp | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/import_test.cpp | 11 |
13 files changed, 150 insertions, 198 deletions
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 3d2963be284..68641508765 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -8,8 +8,7 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$") TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose - ACE_ENV_ARG_DECL) + CORBA::Boolean verbose) ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose) { @@ -53,12 +52,11 @@ TAO_Offer_Exporter::export_offers (void) this->props_fs_[i][4].value <<= "Default"; } - this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER); + this->export_to (this->register_.in ()); } void -TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg - ACE_ENV_ARG_DECL) +TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -70,7 +68,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg CosTrading::MissingMandatoryProperty, CosTrading::DuplicatePropertyName)) { - ACE_TRY + try { for (int i = 0; i < NUM_OFFERS; i++) { @@ -79,8 +77,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg CosTrading::OfferId_var offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[1], - this->props_plotters_[i] - ACE_ENV_ARG_PARAMETER); + this->props_plotters_[i]); if (this->verbose_) { @@ -91,8 +88,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[2], - this->props_printers_[i] - ACE_ENV_ARG_PARAMETER); + this->props_printers_[i]); if (this->verbose_) { @@ -103,9 +99,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[3], - this->props_fs_[i] - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK + this->props_fs_[i]); if (this->verbose_) { @@ -113,12 +107,12 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::export_offers"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Exporter::export_offers"); + throw; } - ACE_ENDTRY; } void @@ -159,7 +153,7 @@ TAO_Offer_Exporter::export_offers_to_all (void) for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--) { - ACE_TRY + try { if (this->verbose_) { @@ -168,7 +162,7 @@ TAO_Offer_Exporter::export_offers_to_all (void) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[i]); for (int j = 0; j < NUM_OFFERS; j++) { @@ -183,13 +177,12 @@ TAO_Offer_Exporter::export_offers_to_all (void) static_cast<const char*> (link_name_seq[i]))); } - this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER); + this->export_to (link_info->target_reg.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ IGNORE?? } - ACE_ENDTRY; } } @@ -203,7 +196,7 @@ TAO_Offer_Exporter::withdraw_offers (void) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n")); - ACE_TRY + try { CORBA::ULong length; @@ -214,16 +207,16 @@ TAO_Offer_Exporter::withdraw_offers (void) length = offer_id_seq->length (); for (CORBA::ULong i = 0; i < length; i++) { - this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER); + this->register_->withdraw (offer_id_seq[i]); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_offers"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Exporter::withdraw_offers"); + throw; } - ACE_ENDTRY; } void @@ -235,7 +228,7 @@ TAO_Offer_Exporter::describe_offers (void) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n")); - ACE_TRY + try { CORBA::ULong length; CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (); @@ -250,24 +243,24 @@ TAO_Offer_Exporter::describe_offers (void) for (CORBA::ULong i = 0; i < length; i++) { CosTrading::Register::OfferInfo_var offer_info = - this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER); + this->register_->describe (offer_id_seq[i]); if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i])); ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ())); - TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER); + TT_Info::dump_properties (offer_info->properties, 0); ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::describe_offers"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Exporter::describe_offers"); + throw; } - ACE_ENDTRY; } void @@ -287,7 +280,7 @@ TAO_Offer_Exporter::modify_offers (void) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n")); - ACE_TRY + try { CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (); @@ -309,17 +302,16 @@ TAO_Offer_Exporter::modify_offers (void) { this->register_->modify (offer_id_seq[i], del_list, - modify_list - ACE_ENV_ARG_PARAMETER); + modify_list); } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::modify_offers"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Exporter::modify_offers"); + throw; } - ACE_ENDTRY; } void @@ -339,30 +331,26 @@ withdraw_offers_using_constraints (void) if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "Constraint: %s\n", constraint)); - ACE_TRY + try { this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER], - constraint - ACE_ENV_ARG_PARAMETER); + constraint); this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER], - constraint - ACE_ENV_ARG_PARAMETER); + constraint); this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM], - constraint - ACE_ENV_ARG_PARAMETER); + constraint); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Offer_Exporter::withdraw_using_constraint"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Exporter::withdraw_using_constraint"); + throw; } - ACE_ENDTRY; } CosTrading::OfferIdSeq* @@ -374,15 +362,14 @@ TAO_Offer_Exporter::grab_offerids (void) ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n")); CosTrading::OfferIdSeq *offer_id_seq; - ACE_TRY + try { CORBA::ULong length = NUM_OFFERS; CosTrading::OfferIdIterator_ptr offer_id_iter; this->admin_->list_offers (NUM_OFFERS, CosTrading::OfferIdSeq_out (offer_id_seq), - CosTrading::OfferIdIterator_out (offer_id_iter) - ACE_ENV_ARG_PARAMETER); + CosTrading::OfferIdIterator_out (offer_id_iter)); if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0) { @@ -394,8 +381,7 @@ TAO_Offer_Exporter::grab_offerids (void) { any_left = offer_id_iter->next_n (length, - CosTrading::OfferIdSeq_out (id_seq) - ACE_ENV_ARG_PARAMETER); + CosTrading::OfferIdSeq_out (id_seq)); int offers = id_seq->length (); int old_length = offer_id_seq->length (); @@ -418,13 +404,11 @@ TAO_Offer_Exporter::grab_offerids (void) ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *)(*offer_id_seq)[j])); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Offer_Exporter::grab_offerids"); - ACE_RE_THROW; + ex._tao_print_exception ("TAO_Offer_Exporter::grab_offerids"); + throw; } - ACE_ENDTRY; // @@ redundant. return offer_id_seq; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index e3cb09ccded..f31142f193b 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -25,8 +25,7 @@ class TAO_TTest_Export TAO_Offer_Exporter public: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose - ACE_ENV_ARG_DECL) + CORBA::Boolean verbose) ACE_THROW_SPEC ((CORBA::SystemException)); ~TAO_Offer_Exporter (void); @@ -104,8 +103,7 @@ private: void create_offers (void); // Fill in each of the offer structures. - void export_to (CosTrading::Register_ptr reg - ACE_ENV_ARG_DECL) + void export_to (CosTrading::Register_ptr reg) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index a3fe6454fe1..c2f2049c714 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -34,7 +34,7 @@ TAO_Offer_Importer::perform_queries (void) policies.return_card (16*NUM_OFFERS); policies.link_follow_rule (CosTrading::always); - this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER); + this->perform_queries_with_policies (policies); } void @@ -80,7 +80,7 @@ TAO_Offer_Importer::perform_directed_queries (void) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[0u]); CosTrading::Lookup_ptr lookup_if = link_info->target.in (); CosTrading::Link_var link_if2 = lookup_if->link_if (); @@ -111,7 +111,7 @@ TAO_Offer_Importer::perform_directed_queries (void) policies.starting_trader (new CosTrading::TraderName (2, 2, trader_name, 1)); - this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER); + this->perform_queries_with_policies (policies); } } else @@ -131,7 +131,6 @@ TAO_Offer_Importer::perform_directed_queries (void) void TAO_Offer_Importer::perform_queries_with_policies ( const TAO_Policy_Creator& policies - ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, @@ -145,7 +144,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( CosTrading::DuplicatePropertyName, CosTrading::DuplicatePolicyName)) { - ACE_TRY + try { CosTrading::Lookup::SpecifiedProps desired_props; @@ -182,8 +181,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( 8, offer_seq_out, offer_iterator_out, - limits_applied_out - ACE_ENV_ARG_PARAMETER); + limits_applied_out); CosTrading::OfferSeq_var offer_seq (offer_seq_ptr); CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr); @@ -193,8 +191,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( { ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n")); this->display_results (*offer_seq_ptr, - offer_iterator_ptr - ACE_ENV_ARG_PARAMETER); + offer_iterator_ptr); if (limits_applied_out->length () > 0) ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n")); @@ -208,21 +205,20 @@ TAO_Offer_Importer::perform_queries_with_policies ( } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Importer::perform_queries"); + throw; } - ACE_ENDTRY; } void TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator - ACE_ENV_ARG_DECL) const + CosTrading::OfferIterator_ptr offer_iterator) const ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { CORBA::ULong length = 0, i = 0; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); @@ -232,12 +228,11 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () - ACE_ENV_ARG_PARAMETER); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()); remote_output->confirm (); - TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER); + TT_Info::dump_properties (offer_seq[i].properties, 1); ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } @@ -254,21 +249,19 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr); any_left = offer_iterator->next_n (length, - iter_offers_out - ACE_ENV_ARG_PARAMETER); + iter_offers_out); CosTrading::OfferSeq_var iter_offers (iter_offers_ptr); for (length = iter_offers->length (), i = 0; i < length; i++) { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () - ACE_ENV_ARG_PARAMETER); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()); remote_output->confirm (); CosTrading::PropertySeq& props = iter_offers[i].properties; - TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER); + TT_Info::dump_properties (props, 1); ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } @@ -278,10 +271,10 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, offer_iterator->destroy (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Offer_Importer::display_results"); + throw; } - ACE_ENDTRY; } diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 5ef28dd3419..74b47228d6a 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -64,8 +64,7 @@ public: private: - void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager - ACE_ENV_ARG_DECL) + void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -81,8 +80,7 @@ private: // pass in <policy_manager>. void display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator - ACE_ENV_ARG_DECL) const + CosTrading::OfferIterator_ptr offer_iterator) const ACE_THROW_SPEC ((CORBA::SystemException)); // Display the results of the query to the screen. diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index e62a03e8657..a09226a8b65 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -6,8 +6,7 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$") TAO_Service_Type_Exporter:: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose - ACE_ENV_ARG_DECL) + CORBA::Boolean verbose) ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose), lookup_ (lookup_if) @@ -16,8 +15,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CosTrading::TypeRepository_var obj = lookup_if->type_repos (); // Narrow the Service Type Repository. - this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()); // Build the service type descriptions. this->create_types (); @@ -35,11 +33,11 @@ TAO_Service_Type_Exporter::remove_all_types (void) for (int i = NUM_TYPES - 1; i >= 0; i--) { - ACE_TRY + try { - this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER); + this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i]); } - ACE_CATCH (CosTrading::UnknownServiceType, excp) + catch (const CosTrading::UnknownServiceType& excp) { if (this->verbose_) { @@ -48,12 +46,11 @@ TAO_Service_Type_Exporter::remove_all_types (void) } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Service_Type_Exporter::remove_all_types"); + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::remove_all_types"); } - ACE_ENDTRY; } } @@ -72,7 +69,7 @@ TAO_Service_Type_Exporter::add_all_types (void) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "adding all types to the Repository.\n")); - this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER); + this->add_all_types_to (this->repos_.in ()); } void @@ -102,12 +99,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--) { CosTradingRepos::ServiceTypeRepository_ptr str = 0; - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n", static_cast<const char*> (link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); + link_if->describe_link (link_name_seq[i]); ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n", static_cast<const char*> (link_name_seq[i]))); @@ -116,25 +113,22 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) link_info->target->type_repos (); str = - CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in () - ACE_ENV_ARG_PARAMETER); + CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ Seth, Ignore all these exceptions? } - ACE_ENDTRY; // @@ Seth, But this one? - this->add_all_types_to (str ACE_ENV_ARG_PARAMETER); + this->add_all_types_to (str); } } void TAO_Service_Type_Exporter:: -add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos - ACE_ENV_ARG_DECL) +add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -147,44 +141,47 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos { for (int i = 0; i < NUM_TYPES; i++) { - ACE_TRY + try { repos->add_type (TT_Info::INTERFACE_NAMES[i], this->type_structs_[i].if_name, this->type_structs_[i].props, - this->type_structs_[i].super_types - ACE_ENV_ARG_PARAMETER); + this->type_structs_[i].super_types); } - ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste) + catch ( + const CosTradingRepos::ServiceTypeRepository::ServiceTypeExists& ste) { - ACE_PRINT_EXCEPTION (ste, "TAO_Service_Type_Exporter::add_all_types"); + ste._tao_print_exception ( + "TAO_Service_Type_Exporter::add_all_types"); if (ste.name.in () != 0) ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", ste.name.in ())); } - ACE_CATCH (CosTrading::IllegalPropertyName, excp) + catch (const CosTrading::IllegalPropertyName& excp) { - ACE_PRINT_EXCEPTION (excp, "TAO_Service_Type_Exporter::add_all_types"); + excp._tao_print_exception ( + "TAO_Service_Type_Exporter::add_all_types"); if (excp.name.in () != 0) ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", excp.name.in ())); } - ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, vtr) + catch ( + const CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition& vtr) { - ACE_PRINT_EXCEPTION (vtr, "TAO_Service_Type_Exporter::add_all_types"); + vtr._tao_print_exception ( + "TAO_Service_Type_Exporter::add_all_types"); if (vtr.type_1.in () != 0) ACE_DEBUG ((LM_DEBUG, "Type One: %s\n", vtr.type_2.in ())); if (vtr.type_2.in () != 0) ACE_DEBUG ((LM_DEBUG, "Type Two: %s\n", vtr.type_2.in ())); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Service_Type_Exporter::add_all_types"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::add_all_types"); + throw; } - ACE_ENDTRY; } } @@ -192,7 +189,7 @@ void TAO_Service_Type_Exporter::list_all_types (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes sst; ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" @@ -200,7 +197,7 @@ TAO_Service_Type_Exporter::list_all_types (void) sst.all_ (1); CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names = - this->repos_->list_types (sst ACE_ENV_ARG_PARAMETER); + this->repos_->list_types (sst); CORBA::ULong l = type_names->length (); for (CORBA::ULong i = 0; i != l; ++i) @@ -213,13 +210,11 @@ TAO_Service_Type_Exporter::list_all_types (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Service_Type_Exporter::list_all_types"); - ACE_RE_THROW; + ex._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types"); + throw; } - ACE_ENDTRY; } void @@ -228,7 +223,7 @@ TAO_Service_Type_Exporter::describe_all_types (void) CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "describing all types in the Repository.\n")); @@ -236,8 +231,7 @@ TAO_Service_Type_Exporter::describe_all_types (void) for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i] - ACE_ENV_ARG_PARAMETER); + this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]); if (this->verbose_) { @@ -246,13 +240,12 @@ TAO_Service_Type_Exporter::describe_all_types (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Service_Type_Exporter::describe_all_types"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::describe_all_types"); + throw; } - ACE_ENDTRY; } void @@ -261,7 +254,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void) CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) { - ACE_TRY + try { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "fully describing all types in the Repository.\n")); @@ -269,8 +262,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void) for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i] - ACE_ENV_ARG_PARAMETER); + this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]); if (this->verbose_) { @@ -279,13 +271,12 @@ TAO_Service_Type_Exporter::fully_describe_all_types (void) } } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_Service_Type_Exporter::fully_describe_all_types"); - ACE_RE_THROW; + ex._tao_print_exception ( + "TAO_Service_Type_Exporter::fully_describe_all_types"); + throw; } - ACE_ENDTRY; } void diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index ce9134fd85c..c11ae36f505 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -24,8 +24,7 @@ class TAO_TTest_Export TAO_Service_Type_Exporter public: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose - ACE_ENV_ARG_DECL) + CORBA::Boolean verbose) ACE_THROW_SPEC ((CORBA::SystemException)); void remove_all_types (void) @@ -85,8 +84,7 @@ private: void create_types (void); // Generate the service type description structures. - void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos - ACE_ENV_ARG_DECL) + void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index c28feb6e4f3..b907db37a75 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -16,8 +16,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) template <class T> CORBA::Any* TAO_Simple_Dynamic_Property<T>::evalDP (const char*, CORBA::TypeCode_ptr, - const CORBA::Any& - ACE_ENV_ARG_DECL_NOT_USED) + const CORBA::Any&) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* return_value = 0; diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index 0f7e395b8f5..d9b455df004 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -33,7 +33,7 @@ public: virtual CORBA::Any* evalDP (const char* /* name */, CORBA::TypeCode_ptr /* returned_type */, const CORBA::Any& /* extra_info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); private: diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index 5864a3aae44..ac783c39186 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -143,8 +143,7 @@ const char* TT_Info::QUERIES[][3] = void TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, - CORBA::Boolean print_dynamic - ACE_ENV_ARG_DECL) + CORBA::Boolean print_dynamic) { TAO_Property_Evaluator prop_eval (prop_seq); @@ -154,13 +153,13 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, CORBA::Any* value = 0; CORBA::TypeCode_ptr tc = 0; ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ())); - ACE_TRY + try { CORBA::Boolean is_dynamic = prop_eval.is_dynamic_property (k); if (print_dynamic || ! is_dynamic) { - value = prop_eval.property_value(k ACE_ENV_ARG_PARAMETER); + value = prop_eval.property_value(k); tc = value->type (); } @@ -169,16 +168,15 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, ACE_DEBUG ((LM_DEBUG, "Dynamic Property\n")); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // @@ Seth, don't pass the exceptions back? ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n")); } - ACE_ENDTRY; if (tc == 0) continue; - int check = tc->equal (TAO_Trader_Test::_tc_StringSeq ACE_ENV_ARG_PARAMETER); + int check = tc->equal (TAO_Trader_Test::_tc_StringSeq); if (check) { @@ -192,7 +190,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, } else { - check = tc->equal (TAO_Trader_Test::_tc_ULongSeq ACE_ENV_ARG_PARAMETER); + check = tc->equal (TAO_Trader_Test::_tc_ULongSeq); if (check) { diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index 7146a4a1e86..76fdc207e07 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -16,8 +16,7 @@ class TAO_TTest_Export TT_Info public: static void dump_properties (const CosTrading::PropertySeq& prop_seq, - CORBA::Boolean print_dynamic = 1 - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + CORBA::Boolean print_dynamic = 1); // Dump the contents of this property sequence. enum INTERFACES diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index aaacba20d2c..4b7a7dfb84f 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -31,10 +31,10 @@ parse_args (int argc, char *argv[], int main (int argc, char** argv) { - ACE_TRY_NEW_ENV + try { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (argc, argv); // Command line argument interpretation. CORBA::Boolean verbose = 0; @@ -56,8 +56,7 @@ main (int argc, char** argv) ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose - ACE_ENV_ARG_PARAMETER); + verbose); type_exporter.remove_all_types (); @@ -73,8 +72,7 @@ main (int argc, char** argv) ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); TAO_Offer_Exporter offer_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose - ACE_ENV_ARG_PARAMETER); + verbose); offer_exporter.withdraw_offers (); @@ -103,11 +101,10 @@ main (int argc, char** argv) offer_importer.perform_queries (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1); } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 0b57ae4128f..5dafa58c709 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -15,10 +15,10 @@ ACE_RCSID (Trading, int main (int argc, char** argv) { - ACE_TRY_NEW_ENV + try { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (argc, argv); // Command line argument interpretation. TT_Parse_Args parse_args (argc, argv); @@ -30,7 +30,7 @@ main (int argc, char** argv) char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); if (CORBA::is_nil (trading_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,13 +40,12 @@ main (int argc, char** argv) // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER); + CosTrading::Lookup::_narrow (trading_obj.in ()); // Run the Service Type Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (lookup_if.in (), - ! parse_args.quiet () - ACE_ENV_ARG_PARAMETER); + ! parse_args.quiet ()); type_exporter.remove_all_types (); @@ -71,7 +70,7 @@ main (int argc, char** argv) // Run the Offer Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); - TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () ACE_ENV_ARG_PARAMETER); + TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet ()); // = Test series. @@ -123,11 +122,10 @@ main (int argc, char** argv) orb_manager.run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR_RETURN ((LM_ERROR, "Trader Export Tests Failed"), -1); } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index b0bd73e7fb1..b2b99b605df 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -8,10 +8,10 @@ ACE_RCSID(Trading, import_test, "$Id$") int main (int argc, char** argv) { - ACE_TRY_NEW_ENV + try { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_manager.init (argc, argv); // Command line argument interpretation. TT_Parse_Args parse_args (argc, argv); @@ -22,7 +22,7 @@ main (int argc, char** argv) char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); if (CORBA::is_nil (trading_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -32,7 +32,7 @@ main (int argc, char** argv) // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER); + CosTrading::Lookup::_narrow (trading_obj.in ()); // Run the Offer Importer tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); @@ -45,11 +45,10 @@ main (int argc, char** argv) offer_importer.perform_directed_queries (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { ACE_ERROR_RETURN ((LM_ERROR, "Trader Import Tests Failed."), -1); } - ACE_ENDTRY; return 0; } |