diff options
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp | 130 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h | 93 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp | 44 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h | 37 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Makefile | 414 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp | 149 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Exporter.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp | 28 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Simple_Dynamic.h | 43 |
9 files changed, 545 insertions, 405 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp deleted file mode 100644 index 176c32ea515..00000000000 --- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// $Id$ - -#include "Dynamic_Property.h" - -TAO_DP_Dispatcher::TAO_DP_Dispatcher(const char* name) -{ -} - -TAO_DP_Dispatcher::~TAO_DP_Dispatcher (void) -{ - for (Handler_Map::iterator handler_iter (this->handlers_); - ! handler_iter.done (); - handler_iter++) - { - Handler_Info& handler_info = (*handler_iter).int_id_; - - if (handler_info.free_on_delete_) - delete handler_info.handle_; - } -} - -int -TAO_DP_Dispatcher:: -register_handler(const char* name, - TAO_DP_Evaluation_Handler* handler, - CORBA::Boolean release_on_delete) -{ - TAO_String_Hash_Key prop_name(name); - - // Set up the handler to receive evaluations for prop_name - Handler_Info handler_info; - handler_info.handle_ = handler; - handler_info.free_on_delete_ = release_on_delete; - - return (this->handlers_.bind (prop_name, handler_info) != 0) ? -1 : 0; -} - -CosTradingDynamic::DynamicProp* -TAO_DP_Dispatcher:: -construct_dynamic_prop (const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info) -{ - CosTradingDynamic::DynamicProp* dp_struct = 0; - - ACE_NEW_RETURN (dp_struct, CosTradingDynamic::DynamicProp, 0); - - TAO_TRY - { - CosTradingDynamic::DynamicPropEval_var dp_eval = this->_this (TAO_TRY_ENV); - -#if defined TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG - CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb (); - dp_struct->eval_if = orb->object_to_string (dp_eval.in (), TAO_TRY_ENV); -#else - dp_struct->eval_if = dp_eval; -#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */ - - TAO_CHECK_ENV; - - dp_struct->returned_type = - CORBA::TypeCode::_duplicate (returned_type); - dp_struct->extra_info = extra_info; - } - TAO_CATCHANY - { - return 0; - } - TAO_ENDTRY; - - return dp_struct; -} - - -TAO_DP_Evaluation_Handler* -TAO_DP_Dispatcher::remove_handler (const char* name) -{ - Handler_Info handler_info; - TAO_String_Hash_Key prop_name (name); - TAO_DP_Evaluation_Handler* handler = 0; - - if (this->handlers_.unbind (prop_name, handler_info) == 0) - handler = handler_info.handle_; - - return handler; -} - -CORBA::Any* -TAO_DP_Dispatcher::evalDP(const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTradingDynamic::DPEvalFailure)) -{ - CORBA::Any* result = 0; - Handler_Info handler_info; - TAO_String_Hash_Key prop_name(name); - - if (this->handlers_.find (prop_name, handler_info) == 0) - { - TAO_DP_Evaluation_Handler* handler = handler_info.handle_; - - result = handler->evalDP (extra_info, returned_type, _env); - TAO_CHECK_ENV_RETURN (_env, result); - - - if (result == 0) - { - TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure - (name, returned_type, extra_info), - result); - } - - if (! returned_type->equal (result->type (), _env)) - { - TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure - (name, returned_type, extra_info), - result); - } - } - else - { - TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure - (name, returned_type, extra_info), - result); - } - - return result; -} diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h deleted file mode 100644 index 9ebc2e7b803..00000000000 --- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- C++ -*- */ - -// ======================================================================== -// $Id$ -// -// = LIBRARY -// orbsvcs -// -// = FILENAME -// Dynamic_Property.h -// -// = AUTHOR -// Seth Widoff <sbw1@cs.wustl.edu> -// -// ======================================================================== - - -#ifndef TAO_DYNAMIC_PROPERTY_H -#define TAO_DYNAMIC_PROPERTY_H - -#include "Trader.h" - -class TAO_ORBSVCS_Export TAO_DP_Evaluation_Handler -{ -public: - - virtual CORBA::Any* evalDP(const CORBA::Any& extra_info, - CORBA::TypeCode_ptr returned_type, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) = 0; - -}; - -class TAO_ORBSVCS_Export TAO_DP_Dispatcher : - public POA_CosTradingDynamic::DynamicPropEval -// = TITLE -// This class exhibits one strategy for handling many dynamic -// properties from a single process. Dynamic_Property, when -// registered with the orb, will receive and dispatch to registered -// handlers, incoming evalDP requests. This pushes the -// demultiplexing of dynamic property evaluation up from the orb -// level and into the application. -{ -public: - - TAO_DP_Dispatcher(const char* name = "Dynamic Property"); - - ~TAO_DP_Dispatcher (void); - - int register_handler (const char* name, - TAO_DP_Evaluation_Handler* handler, - CORBA::Boolean release_on_delete = CORBA::B_FALSE); - // Registers a handler with the Dynamic_Property - // demultiplexer. Returns 0 upon success or -1 on failure (i.e., a - // property with the same name is already registered). - - TAO_DP_Evaluation_Handler* remove_handler(const char* name); - - virtual CORBA::Any* evalDP(const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CORBA::SystemException, - CosTradingDynamic::DPEvalFailure)); - // Point of demultiplexing. - - CosTradingDynamic::DynamicProp* - construct_dynamic_prop (const char* name, - CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info); -private: - - TAO_DP_Dispatcher (const TAO_DP_Dispatcher&); - TAO_DP_Dispatcher& operator= (const TAO_DP_Dispatcher&); - - struct Handler_Info - { - TAO_DP_Evaluation_Handler* handle_; - CORBA::Boolean free_on_delete_; - }; - - typedef ACE_Hash_Map_Manager - < - TAO_String_Hash_Key, - Handler_Info, - ACE_Null_Mutex - > Handler_Map; - - Handler_Map handlers_; - -}; - -#endif /* TAO_DYNAMIC_PROPERTY_H*/ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 9307684011d..ca04c64861e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -443,6 +443,50 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name) } // ************************************************************* + // TAO_Dynamic_Property + // ************************************************************* + +TAO_Dynamic_Property::~TAO_Dynamic_Property (void) +{ +} + +CosTradingDynamic::DynamicProp* +TAO_Dynamic_Property:: +construct_dynamic_prop (const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info) +{ + CosTradingDynamic::DynamicProp* dp_struct = 0; + + ACE_NEW_RETURN (dp_struct, CosTradingDynamic::DynamicProp, 0); + + TAO_TRY + { + CosTradingDynamic::DynamicPropEval_var dp_eval = + this->_this (TAO_TRY_ENV); + +#if defined TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG + CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb (); + dp_struct->eval_if = orb->object_to_string (dp_eval.in (), TAO_TRY_ENV); +#else + dp_struct->eval_if = dp_eval; +#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */ + + TAO_CHECK_ENV; + + dp_struct->returned_type = CORBA::TypeCode::_duplicate (returned_type); + dp_struct->extra_info = extra_info; + } + TAO_CATCHANY + { + return 0; + } + TAO_ENDTRY; + + return dp_struct; +} + + // ************************************************************* // TAO_Policies // ************************************************************* diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 3019fa48e96..b0737e074b6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -13,6 +13,7 @@ // Seth Widoff <sbw1@cs.wustl.edu> // // Client Utils: +// TAO_Dynamic_Property // TAO_Policy_Manager // TAO_Property_Evaluator // TAO_Property_Evaluator_By_Name @@ -118,7 +119,7 @@ public: // TAO_Property_Evaluator_By_Name // ************************************************************* -class TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator +class TAO_ORBSVCS_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator // // = TITLE // This class extends the TAO_Property_Evaluator to allow lookups @@ -185,6 +186,35 @@ private: }; // ************************************************************* + // TAO_Dynamic_Property + // ************************************************************* + +class TAO_ORBSVCS_Export TAO_Dynamic_Property : + public POA_CosTradingDynamic::DynamicPropEval +// = TITLE +// Little helper class that you can extend to have your dynamic +// property handler construct CosTradingDynamic::DynamicProp structs +// on demand. +{ +public: + + virtual ~TAO_Dynamic_Property (void); + + virtual CORBA::Any* evalDP(const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CORBA::SystemException, + CosTradingDynamic::DPEvalFailure)) = 0; + + CosTradingDynamic::DynamicProp* + construct_dynamic_prop (const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info); +}; + + + // ************************************************************* // TAO_Policies // ************************************************************* @@ -526,12 +556,17 @@ private: TAO_Policy_Manager& operator= (const TAO_Policy_Manager&); CosTrading::Policy& fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type); + // Method to prepare the next slot in the policies_ sequence for + // policy insertion. int poltable_[TAO_Policies::REQUEST_ID + 1]; + // Table mapping policy enum value to the index in the policies sequence. CosTrading::PolicySeq policies_; + // The sequence being prepared for submittal to the query method. CORBA::ULong num_policies_; + // The number of policies so far in the sequence. }; diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index 87435392c44..21c49273c3c 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -23,7 +23,8 @@ FILES = $(IDL_FILES) \ TT_Info \ Service_Type_Exporter \ Offer_Exporter \ - Offer_Importer + Offer_Importer \ + Simple_Dynamic LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) \ @@ -173,8 +174,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -206,7 +209,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -216,22 +218,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -261,6 +253,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -269,6 +263,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -392,8 +395,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -425,7 +430,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -435,22 +439,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -480,6 +474,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -488,6 +484,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -611,8 +616,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -644,7 +651,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -654,22 +660,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -699,6 +695,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -707,6 +705,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -718,10 +725,8 @@ realclean: clean $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h TTestC.i \ TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ @@ -843,8 +848,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -876,7 +883,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -886,22 +892,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -931,6 +927,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -939,6 +937,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -950,10 +957,8 @@ realclean: clean $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h TTestC.i \ TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i .obj/Offer_Exporter.o .obj/Offer_Exporter.so .shobj/Offer_Exporter.o .shobj/Offer_Exporter.so: Offer_Exporter.cpp Offer_Exporter.h TT_Info.h \ TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \ @@ -1067,8 +1072,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -1100,7 +1107,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1110,22 +1116,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1155,6 +1151,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1163,6 +1161,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1174,18 +1181,18 @@ realclean: clean $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h TTestC.i \ TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Dynamic_Property.h \ + Simple_Dynamic.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ + Simple_Dynamic.cpp .obj/Offer_Importer.o .obj/Offer_Importer.so .shobj/Offer_Importer.o .shobj/Offer_Importer.so: Offer_Importer.cpp Offer_Importer.h TT_Info.h \ TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -1298,8 +1305,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(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/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -1331,7 +1340,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1341,13 +1349,51 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ @@ -1357,6 +1403,193 @@ realclean: clean $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h TTestC.i \ + TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i +.obj/Simple_Dynamic.o .obj/Simple_Dynamic.so .shobj/Simple_Dynamic.o .shobj/Simple_Dynamic.so: Simple_Dynamic.cpp Simple_Dynamic.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.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/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(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/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(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/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 \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.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/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(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/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/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(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/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/compat/objbase.h \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(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/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1386,6 +1619,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1394,6 +1629,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1403,19 +1647,13 @@ realclean: clean $(TAO_ROOT)/tao/GIOP.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.h \ + $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/SequencesC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ + Simple_Dynamic.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index d6f660e5819..d89304fb6dc 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -1,44 +1,6 @@ // $Id$ #include "Offer_Exporter.h" -template<class T> -class Simple_DP_Evaluation_Handler - : public TAO_DP_Evaluation_Handler -{ -public: - Simple_DP_Evaluation_Handler (T dp); - - virtual CORBA::Any* evalDP (const CORBA::Any& extra_info, - CORBA::TypeCode_ptr returned_type, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); - -private: - - T dp_; -}; - - -template <class T> -Simple_DP_Evaluation_Handler<T>::Simple_DP_Evaluation_Handler (T dp) - : dp_ (dp) -{ -} - -template <class T> CORBA::Any* -Simple_DP_Evaluation_Handler<T>::evalDP (const CORBA::Any& extra_info, - CORBA::TypeCode_ptr returned_type, - CORBA::Environment& _env) - TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) -{ - CORBA::Any* return_value = 0; - - ACE_NEW_RETURN (return_value, CORBA::Any, 0); - - (*return_value) <<= *(new T (this->dp_)); - return return_value; -} - TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Environment& _env) @@ -56,6 +18,12 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, TAO_Offer_Exporter::~TAO_Offer_Exporter (void) { + while (! this->clean_up_.is_empty ()) + { + TAO_Dynamic_Property* dp = 0; + this->clean_up_.dequeue_head (dp); + delete dp; + } } void @@ -94,19 +62,19 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, { CosTrading::OfferId_var offer_id = reg->export (this->plotter_[i]._this (TAO_TRY_ENV), - TT_Info::INTERFACE_NAMES[1], - this->props_plotters_[i], - TAO_TRY_ENV); + TT_Info::INTERFACE_NAMES[1], + this->props_plotters_[i], + TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ())); - + offer_id = reg->export (this->printer_[i]._this (TAO_TRY_ENV), - TT_Info::INTERFACE_NAMES[2], - this->props_printers_[i], - TAO_TRY_ENV); + TT_Info::INTERFACE_NAMES[2], + this->props_printers_[i], + TAO_TRY_ENV); TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ())); - + offer_id = reg->export (this->fs_[i]._this (TAO_TRY_ENV), TT_Info::INTERFACE_NAMES[3], this->props_fs_[i], @@ -369,9 +337,9 @@ TAO_Offer_Exporter::create_offers (void) TAO_Trader_Test::StringSeq string_seq (QUEUE_SIZE); TAO_Trader_Test::ULongSeq ulong_seq (QUEUE_SIZE); - CosTradingDynamic::DynamicProp* dp_user_queue; - CosTradingDynamic::DynamicProp* dp_file_queue; - CosTradingDynamic::DynamicProp* dp_space_left; + CosTradingDynamic::DynamicProp_var dp_user_queue; + CosTradingDynamic::DynamicProp_var dp_file_queue; + CosTradingDynamic::DynamicProp_var dp_space_left; ACE_INET_Addr addr ((u_short) 0); const char* hostname = addr.get_host_name (); @@ -391,29 +359,26 @@ TAO_Offer_Exporter::create_offers (void) string_seq[j] = TT_Info::USERS [counter]; ulong_seq[j] = counter * 10000; } + + TAO_Dynamic_Property* user_queue = + new TAO_Simple_Dynamic_Property<TAO_Trader_Test::StringSeq> (string_seq); + TAO_Dynamic_Property* file_sizes = + new TAO_Simple_Dynamic_Property<TAO_Trader_Test::ULongSeq> (ulong_seq); - dp_user_queue = this->dp_plotters_[i].construct_dynamic_prop + this->clean_up_.enqueue_head (user_queue); + this->clean_up_.enqueue_head (file_sizes); + + dp_user_queue = user_queue->construct_dynamic_prop (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE], TAO_Trader_Test::_tc_StringSeq, extra_info); - dp_file_queue = this->dp_plotters_[i].construct_dynamic_prop + dp_file_queue = file_sizes->construct_dynamic_prop (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING], TAO_Trader_Test::_tc_ULongSeq, extra_info); - this->dp_plotters_[i].register_handler - (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE], - new Simple_DP_Evaluation_Handler<TAO_Trader_Test::StringSeq> (string_seq), - CORBA::B_TRUE); - - this->dp_plotters_[i].register_handler - (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING], - new Simple_DP_Evaluation_Handler<TAO_Trader_Test::ULongSeq> (ulong_seq), - CORBA::B_TRUE); - this->props_plotters_[i].length (11); - this->props_plotters_[i][0].name = TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]; this->props_plotters_[i][0].value <<= name; this->props_plotters_[i][1].name = TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]; @@ -433,9 +398,9 @@ TAO_Offer_Exporter::create_offers (void) this->props_plotters_[i][8].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_MODEL_NUMBER]; this->props_plotters_[i][8].value <<= TT_Info::MODEL_NUMBERS[i]; this->props_plotters_[i][9].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE]; - this->props_plotters_[i][9].value <<= *dp_user_queue; + this->props_plotters_[i][9].value <<= dp_user_queue.in (); this->props_plotters_[i][10].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING]; - this->props_plotters_[i][10].value <<= *dp_file_queue; + this->props_plotters_[i][10].value <<= dp_file_queue.in (); } // Initialize printers @@ -452,25 +417,23 @@ TAO_Offer_Exporter::create_offers (void) ulong_seq[j] = counter * 10000; } - dp_user_queue = this->dp_printers_[i].construct_dynamic_prop - (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE], + TAO_Dynamic_Property* user_queue = + new TAO_Simple_Dynamic_Property<TAO_Trader_Test::StringSeq> (string_seq); + TAO_Dynamic_Property* file_sizes = + new TAO_Simple_Dynamic_Property<TAO_Trader_Test::ULongSeq> (ulong_seq); + + this->clean_up_.enqueue_head (user_queue); + this->clean_up_.enqueue_head (file_sizes); + + dp_user_queue = user_queue->construct_dynamic_prop + (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE], TAO_Trader_Test::_tc_StringSeq, extra_info); - dp_file_queue = this->dp_printers_[i].construct_dynamic_prop - (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING], + dp_file_queue = file_sizes->construct_dynamic_prop + (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING], TAO_Trader_Test::_tc_ULongSeq, extra_info); - - this->dp_printers_[i].register_handler - (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE], - new Simple_DP_Evaluation_Handler<TAO_Trader_Test::StringSeq> (string_seq), - CORBA::B_TRUE); - - this->dp_printers_[i].register_handler - (TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING], - new Simple_DP_Evaluation_Handler<TAO_Trader_Test::ULongSeq> (ulong_seq), - CORBA::B_TRUE); this->props_printers_[i].length (12); this->props_printers_[i][0].name = TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]; @@ -494,9 +457,9 @@ TAO_Offer_Exporter::create_offers (void) this->props_printers_[i][9].name = TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_PAGES_PER_SEC]; this->props_printers_[i][9].value <<= (CORBA::UShort) i; this->props_printers_[i][10].name = TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_USER_QUEUE]; - this->props_printers_[i][10].value <<= *dp_user_queue; + this->props_printers_[i][10].value <<= dp_user_queue.in (); this->props_printers_[i][11].name = TT_Info::PRINTER_PROPERTY_NAMES[TT_Info::PRINTER_FILE_SIZES_PENDING]; - this->props_printers_[i][11].value <<= *dp_file_queue; + this->props_printers_[i][11].value <<= dp_file_queue.in (); } // Initialize FileSystem @@ -507,16 +470,16 @@ TAO_Offer_Exporter::create_offers (void) "%s is a File System. It stores stuff.", name); - dp_space_left = this->dp_fs_[i].construct_dynamic_prop + TAO_Dynamic_Property* space_left = + new TAO_Simple_Dynamic_Property<CORBA::ULong> (i * 4434343); + + this->clean_up_.enqueue_head (space_left); + + dp_space_left = space_left->construct_dynamic_prop (TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING], CORBA::_tc_ulong, extra_info); - this->dp_fs_[i].register_handler - (TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING], - new Simple_DP_Evaluation_Handler<CORBA::ULong> (i * 4434343), - CORBA::B_TRUE); - this->props_fs_[i].length (8); this->props_fs_[i][0].name = TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]; this->props_fs_[i][0].value <<= name; @@ -533,6 +496,18 @@ TAO_Offer_Exporter::create_offers (void) this->props_fs_[i][6].name = TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::PERMISSION_LEVEL]; this->props_fs_[i][6].value <<= (CORBA::UShort) (i + 1); this->props_fs_[i][7].name = TT_Info::FILESYSTEM_PROPERTY_NAMES[TT_Info::SPACE_REMAINING]; - this->props_fs_[i][7].value <<= *dp_space_left; + this->props_fs_[i][7].value <<= dp_space_left.in (); } } + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Unbounded_Queue<CORBA::Object_var>; +template class TAO_Simple_Dynamic_Property<CosTradingSequences::StringSeq>; +template class TAO_Simple_Dynamic_Property<CosTradingSequences::ULongSeq>; +template class TAO_Simple_Dynamic_Property<CosTradingSequences::ULong>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Unbounded_Queue<CORBA::Object_var> +#pragma instantiate TAO_Simple_Dynamic_Property<CosTradingSequences::StringSeq> +#pragma instantiate TAO_Simple_Dynamic_Property<CosTradingSequences::ULongSeq> +#pragma instantiate TAO_Simple_Dynamic_Property<CosTradingSequences::ULong> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index 0fe16ee9989..cdb2f190167 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -17,7 +17,7 @@ #define TAO_OFFER_EXPORTER_H #include "TT_Info.h" -#include "orbsvcs/Trader/Dynamic_Property.h" +#include "Simple_Dynamic.h" class TAO_Offer_Exporter { @@ -106,6 +106,8 @@ private: CosTrading::ReadonlyDynamicProperty, CosTrading::MissingMandatoryProperty, CosTrading::DuplicatePropertyName)); + + typedef ACE_Unbounded_Queue<TAO_Dynamic_Property*> DP_Queue; CosTrading::Register_var register_; CosTrading::Admin_var admin_; @@ -113,14 +115,12 @@ private: TT_Info::Printer printer_[NUM_OFFERS]; TT_Info::Plotter plotter_[NUM_OFFERS]; TT_Info::File_System fs_[NUM_OFFERS]; - - TAO_DP_Dispatcher dp_plotters_[NUM_OFFERS]; - TAO_DP_Dispatcher dp_printers_[NUM_OFFERS]; - TAO_DP_Dispatcher dp_fs_[NUM_OFFERS]; - + CosTrading::PropertySeq props_plotters_[NUM_OFFERS]; CosTrading::PropertySeq props_printers_[NUM_OFFERS]; CosTrading::PropertySeq props_fs_[NUM_OFFERS]; + + DP_Queue clean_up_; }; #endif /* TAO_OFFER_EXPORTER_H */ diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp new file mode 100644 index 00000000000..fc81a361453 --- /dev/null +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -0,0 +1,28 @@ +// $Id$ + +#ifndef TAO_SIMPLE_DYNAMIC_C +#define TAO_SIMPLE_DYNAMIC_C + +#include "Simple_Dynamic.h" + +template <class T> +TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) + : dp_ (dp) +{ +} + +template <class T> CORBA::Any* +TAO_Simple_Dynamic_Property<T>::evalDP (const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) +{ + CORBA::Any* return_value = 0; + ACE_NEW_RETURN (return_value, CORBA::Any, 0); + + (*return_value) <<= this->dp_; + return return_value; +} + +#endif /* TAO_SIMPLE_DYNAMIC_C */ diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h new file mode 100644 index 00000000000..09817920f5c --- /dev/null +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -0,0 +1,43 @@ +// $Id$ + +// ======================================================================== +// +// = FILE +// Simple_Dyanmic.h +// +// = DESCRIPTION +// Class that implements a really simple dynamic property. +// +// = AUTHOR +// Seth Widoff <sbw1@cs.wustl.edu> +// +// ======================================================================= + +#ifndef TAO_SIMPLE_DYNAMIC_H +#define TAO_SIMPLE_DYNAMIC_H + +#include "orbsvcs/Trader/Trader_Utils.h" + +template<class T> +class TAO_Simple_Dynamic_Property : public TAO_Dynamic_Property +{ +public: + + TAO_Simple_Dynamic_Property (const T& dp); + + virtual CORBA::Any* evalDP (const char* name, + CORBA::TypeCode_ptr returned_type, + const CORBA::Any& extra_info, + CORBA::Environment& _env) + TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); + +private: + + T dp_; +}; + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "Simple_Dynamic.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#endif /* TAO_SIMPLE_DYNAMIC_H */ |