From 3a9f21d034a182f2671b34ba3e571ca4c7fadcef Mon Sep 17 00:00:00 2001 From: edwardgt Date: Tue, 4 May 2004 09:22:29 +0000 Subject: *** empty log message *** --- TAO/CIAO/examples/UAV/Battle/Battle_exec.cpp | 3 ++- TAO/CIAO/examples/UAV/CAOC/CAOC_exec.cpp | 8 ++++++-- TAO/CIAO/examples/UAV/Engagement/Engagement_exec.cpp | 11 +++++------ TAO/CIAO/examples/UAV/Engagement/Engagement_svnt.cpp | 12 ++++++++++++ TAO/CIAO/examples/UAV/UCAV/UCAV_exec.cpp | 2 +- TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec.cpp | 2 +- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/TAO/CIAO/examples/UAV/Battle/Battle_exec.cpp b/TAO/CIAO/examples/UAV/Battle/Battle_exec.cpp index 7fae6b83df3..ef851715530 100644 --- a/TAO/CIAO/examples/UAV/Battle/Battle_exec.cpp +++ b/TAO/CIAO/examples/UAV/Battle/Battle_exec.cpp @@ -22,7 +22,8 @@ MyImpl::Battle_exec_i::push_start_engage (BBN_UAV::StartEngage *ev ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - + ACE_DEBUG ((LM_DEBUG, + "Battle, received a StartEngage from Engagement \n")); } // Operations from Components::SessionComponent diff --git a/TAO/CIAO/examples/UAV/CAOC/CAOC_exec.cpp b/TAO/CIAO/examples/UAV/CAOC/CAOC_exec.cpp index 0ccfca2e69e..4978eba4c02 100644 --- a/TAO/CIAO/examples/UAV/CAOC/CAOC_exec.cpp +++ b/TAO/CIAO/examples/UAV/CAOC/CAOC_exec.cpp @@ -23,12 +23,16 @@ MyImpl::CAOC_exec_i::push_target_located (BBN_UAV::TargetLocated *ev ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify others - BBN_UAV::PrepareCapture_var event = new OBV_BBN_UAV::PrepareCapture; + BBN_UAV::PrepareCapture_var event1 = new OBV_BBN_UAV::PrepareCapture; + BBN_UAV::PrepareEngage_var event2 = new OBV_BBN_UAV::PrepareEngage; ACE_DEBUG ((LM_DEBUG, "CAOC, received a TargetLocated from Satellite \n")); - this->context_->push_prepare_capture (event + this->context_->push_prepare_capture (event1 + ACE_ENV_ARG_PARAMETER); + + this->context_->push_prepare_engage (event2 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/CIAO/examples/UAV/Engagement/Engagement_exec.cpp b/TAO/CIAO/examples/UAV/Engagement/Engagement_exec.cpp index 9a6fcc52e85..a991ba93c29 100644 --- a/TAO/CIAO/examples/UAV/Engagement/Engagement_exec.cpp +++ b/TAO/CIAO/examples/UAV/Engagement/Engagement_exec.cpp @@ -23,17 +23,16 @@ MyImpl::Engagement_exec_i::push_prepare_engage (BBN_UAV::PrepareEngage *ev ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify others - BBN_UAV::PrepareMove_var event1 = new OBV_BBN_UAV::PrepareMove; - - BBN_UAV::StartEngage_var event2 = new OBV_BBN_UAV::StartEngage; + BBN_UAV::StartEngage_var event1 = new OBV_BBN_UAV::StartEngage; + BBN_UAV::PrepareMove_var event2 = new OBV_BBN_UAV::PrepareMove; ACE_DEBUG ((LM_DEBUG, "Engagement, received a PrepareEngage from CAOC \n")); - - this->context_->push_prepare_move (event1 + + this->context_->push_start_engage (event1 ACE_ENV_ARG_PARAMETER); - this->context_->push_start_engage (event2 + this->context_->push_prepare_move (event2 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/CIAO/examples/UAV/Engagement/Engagement_svnt.cpp b/TAO/CIAO/examples/UAV/Engagement/Engagement_svnt.cpp index 49cd839d5c3..b60aeabe62d 100644 --- a/TAO/CIAO/examples/UAV/Engagement/Engagement_svnt.cpp +++ b/TAO/CIAO/examples/UAV/Engagement/Engagement_svnt.cpp @@ -241,6 +241,17 @@ namespace Engagement_Impl ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + + ACE_CString my_uuid = this->servant_->component_UUID (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + my_uuid += "_prepare_move_publisher"; + + this->container_->push_event (ev, + my_uuid.c_str () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + /* ACE_Active_Map_Manager< ::BBN_UAV::PrepareMoveConsumer_var>::iterator end = this->ciao_publishes_prepare_move_map_.end (); @@ -265,6 +276,7 @@ namespace Engagement_Impl ACE_ENV_ARG_PARAMETER); ACE_CHECK; } + */ } ::Components::Cookie * diff --git a/TAO/CIAO/examples/UAV/UCAV/UCAV_exec.cpp b/TAO/CIAO/examples/UAV/UCAV/UCAV_exec.cpp index 55ffe02b858..19abdb3416c 100644 --- a/TAO/CIAO/examples/UAV/UCAV/UCAV_exec.cpp +++ b/TAO/CIAO/examples/UAV/UCAV/UCAV_exec.cpp @@ -23,7 +23,7 @@ MyImpl::UCAV_exec_i::push_start_move (BBN_UAV::StartMove *ev ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, - "UCAV, received a StartMove from CAOC \n")); + "UCAV, received a StartMove from UCAV_GS \n")); } // Operations from Components::SessionComponent diff --git a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec.cpp b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec.cpp index 4ba3cc2370c..62b58c42411 100644 --- a/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec.cpp +++ b/TAO/CIAO/examples/UAV/UCAV_GS/UCAV_GS_exec.cpp @@ -29,7 +29,7 @@ MyImpl::UCAV_GS_exec_i::push_prepare_move (BBN_UAV::PrepareMove *ev "UCAV_GS, received a PrepareMove from Engagement \n")); this->context_->push_start_move (event - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } -- cgit v1.2.1