diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-05-27 23:46:43 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-05-27 23:46:43 +0000 |
| commit | c00148744a6b4c0fadfec1338d72624b12766658 (patch) | |
| tree | c96783564273d482e56946ad01fa265a5403d90d | |
| parent | 342d9652f707aac3395f2a8b6bbf21dc54593f3f (diff) | |
| download | ATCD-c00148744a6b4c0fadfec1338d72624b12766658.tar.gz | |
Wed May 27 23:44:58 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
139 files changed, 464 insertions, 263 deletions
diff --git a/Allocator/Base/Allocator_Base.mpc b/Allocator/Base/Allocator_Base.mpc index 9e52dfc97a8..8a8d34b1099 100644 --- a/Allocator/Base/Allocator_Base.mpc +++ b/Allocator/Base/Allocator_Base.mpc @@ -11,7 +11,7 @@ project(Allocator_Base_idl_gen) : taoidldefaults, anytypecode, race_idl { } } -project(Allocator_Base_stub) : ciao_client_dnc, race_common { +project(Allocator_Base_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Allocator_Base_idl_gen \ OpString_stub \ @@ -43,7 +43,7 @@ project(Allocator_Base_stub) : ciao_client_dnc, race_common { } } -project(Allocator_Base_svnt) : ciao_servant_dnc, race_common { +project(Allocator_Base_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Allocator_Base_exec sharedname = Allocator_Base_svnt diff --git a/Allocator/FirstFit/FirstFit.mpc b/Allocator/FirstFit/FirstFit.mpc index c6587168023..c872f17f3de 100644 --- a/Allocator/FirstFit/FirstFit.mpc +++ b/Allocator/FirstFit/FirstFit.mpc @@ -31,7 +31,7 @@ project(FirstFit_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl { } } -project(FirstFit_stub) : ciao_client_dnc, race_common { +project(FirstFit_stub) : ccm_stub, race_common { avoids += ace_for_tao after += FirstFit_idl_gen libs += Allocator_Base_stub @@ -56,7 +56,7 @@ project(FirstFit_stub) : ciao_client_dnc, race_common { } } -project(FirstFit_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(FirstFit_exec) : ciao_executor, ciao_config_handlers, race_common { avoids += ace_for_tao after += FirstFit_cidl_gen FirstFit_stub sharedname = FirstFit_exec @@ -89,7 +89,7 @@ project(FirstFit_exec) : ciao_component_dnc, ciao_config_handlers, race_common { } -project(FirstFit_svnt) : ciao_servant_dnc, race_common { +project(FirstFit_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += FirstFit_exec sharedname = FirstFit_svnt diff --git a/Allocator/FirstFit/FirstFit_exec.cpp b/Allocator/FirstFit/FirstFit_exec.cpp index 2627f1e7883..8520f3d3fe2 100644 --- a/Allocator/FirstFit/FirstFit_exec.cpp +++ b/Allocator/FirstFit/FirstFit_exec.cpp @@ -233,7 +233,7 @@ namespace CIAO } void - First_Fit_Allocator_exec_i::ciao_postactivate () + First_Fit_Allocator_exec_i::configuration_complete () { // Your code here. } diff --git a/Allocator/FirstFit/FirstFit_exec.h b/Allocator/FirstFit/FirstFit_exec.h index fdbb34d27f7..e91bd40b395 100644 --- a/Allocator/FirstFit/FirstFit_exec.h +++ b/Allocator/FirstFit/FirstFit_exec.h @@ -108,7 +108,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/ChangeLog b/ChangeLog index 945a386d8ae..511ab2f38f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,155 @@ +Wed May 27 23:44:58 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * Allocator/Base/Allocator_Base.mpc: + * Allocator/FirstFit/FirstFit.mpc: + * Allocator/FirstFit/FirstFit_exec.h: + * Allocator/FirstFit/FirstFit_exec.cpp: + * Conductor/Conductor.mpc: + * Conductor/Conductor_exec.h: + * Conductor/Conductor_exec.cpp: + * Controller/Base/Controller_Base.mpc: + * Controller/Component/Controller.mpc: + * Controller/Component/Controller_exec.h: + * Controller/Component/Controller_exec.cpp: + * Controller/EUCON/EUCON_Controller.mpc: + * Controller/EUCON/EUCON_Controller_exec.h: + * Controller/EUCON/EUCON_Controller_exec.cpp: + * Controller/FMUF/FMUF_Controller.mpc: + * Controller/FMUF/FMUF_Controller_exec.h: + * Controller/FMUF/FMUF_Controller_exec.cpp: + * Data_Base/Data_Base.mpc: + * Data_Base/Data_Base_exec.h: + * Data_Base/Data_Base_exec.cpp: + * Effectors/Base/Effector_Base.idl: + * Effectors/Base/Effector_Base.mpc: + * Effectors/EUCON/EUCON_Effector.mpc: + * Effectors/EUCON/EUCON_Effector_exec.h: + * Effectors/EUCON/EUCON_Effector_exec.cpp: + * Input_Adapters/Base/Input_Adapter_Base.mpc: + * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl: + * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc: + * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h: + * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp: + * Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl: + * Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc: + * Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h: + * Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp: + * Monitor/Central_Monitor/Monitor.mpc: + * Monitor/Central_Monitor/Monitor_exec.h: + * Monitor/Central_Monitor/Monitor_exec.cpp: + * Monitor/Local_Monitor/Local_Monitor.mpc: + * Output_Adapters/Base/Output_Adapter.mpc: + * Output_Adapters/Component/Output_Manager.mpc: + * Output_Adapters/Component/Output_Manager_exec.h: + * Output_Adapters/Component/Output_Manager_exec.cpp: + * Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h: + * Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp: + * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc: + * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h: + * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp: + * Output_Adapters/Interface/Output_Adapter_Interface.mpc: + * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc: + * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h: + * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp: + * Plan_Analyzer/Component/Plan_Analyzer.mpc: + * Plan_Analyzer/Component/Plan_Analyzer_exec.h: + * Plan_Analyzer/Component/Plan_Analyzer_exec.cpp: + * Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc: + * Planner_Manager/Component/Planner_Manager.mpc: + * Planner_Manager/Component/Planner_Manager_exec.h: + * Planner_Manager/Component/Planner_Manager_exec.cpp: + * Planner_Manager/Interface/Planner_Manager_Interface.mpc: + * Planners/Base/Planner.mpc: + * Planners/Interface/Planner_Interface.mpc: + * Planners/StaticPlanner/StaticPlanner.mpc: + * Planners/StaticPlanner/StaticPlanner_exec.h: + * Planners/StaticPlanner/StaticPlanner_exec.cpp: + * SA_POP/Component/SA_POP_Component.mpc: + * SA_POP/Component/SA_POP_Component_exec.h: + * SA_POP/Component/SA_POP_Component_exec.cpp: + * SA_POP/SANet/SANetFileIn.cpp: + * SA_POP/SAPOP_w_ACE.mpc: + * SA_POP/SA_POP_XML_Typedefs.h: + * SA_POP/SA_POP_XML_Typedefs.cpp: + * SA_POP/SA_POP_for_RACE.mpc: + * SA_POP/TaskMapFileIn.cpp: + * SA_POP/Tester/Tester_Component.mpc: + * SA_POP/Tester/Tester_Component_exec.h: + * SA_POP/Tester/Tester_Component_exec.cpp: + * SA_POP/examples/Space/source/Analysis/Analysis_Component.mpc: + * SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.h: + * SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.cpp: + * SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.mpc: + * SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.h: + * SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.cpp: + * SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.mpc: + * SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.h: + * SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.cpp: + * SA_POP/examples/Space/source/Comm/Comm_Component.mpc: + * SA_POP/examples/Space/source/Comm/Comm_Component_exec.h: + * SA_POP/examples/Space/source/Comm/Comm_Component_exec.cpp: + * SA_POP/examples/Space/source/Compression/Compression_Component.mpc: + * SA_POP/examples/Space/source/Compression/Compression_Component_exec.h: + * SA_POP/examples/Space/source/Compression/Compression_Component_exec.cpp: + * SA_POP/examples/Space/source/Exec/Exec_Component.mpc: + * SA_POP/examples/Space/source/Exec/Exec_Component_exec.h: + * SA_POP/examples/Space/source/Exec/Exec_Component_exec.cpp: + * SA_POP/examples/Space/source/Filter/Filter_Component.mpc: + * SA_POP/examples/Space/source/Filter/Filter_Component_exec.h: + * SA_POP/examples/Space/source/Filter/Filter_Component_exec.cpp: + * SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.mpc: + * SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.h: + * SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.cpp: + * SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.mpc: + * SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.h: + * SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.cpp: + * SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.mpc: + * SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.h: + * SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.cpp: + * SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.mpc: + * SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.h: + * SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.cpp: + * SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.mpc: + * SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.h: + * SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.cpp: + * SA_POP/examples/Space/source/Ground/Ground_Component.mpc: + * SA_POP/examples/Space/source/Ground/Ground_Component_exec.h: + * SA_POP/examples/Space/source/Ground/Ground_Component_exec.cpp: + * SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.mpc: + * SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.h: + * SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.cpp: + * SA_POP/examples/Space/source/common/Event_Types.mpc: + * SA_POP/server/Driver.mpc: + * TM_Daemon/TM_Daemon.mpc: + * TM_Proxy/ResourceManager.h: + * TM_Proxy/ResourceManager.cpp: + * TM_Proxy/TM_Proxy.idl: + * TM_Proxy/TM_Proxy.mpc: + * TM_Proxy/TM_Proxy_exec.h: + * TM_Proxy/TM_Proxy_exec.cpp: + * Tester/tester.mpc: + * common/RACE_common.mpc: + * examples/E2E_Task/Base/Event_Types.mpc: + * examples/E2E_Task/Subtask/Subtask.mpc: + * examples/E2E_Task/Subtask/Subtask_exec.h: + * examples/E2E_Task/Subtask/Subtask_exec.cpp: + * examples/E2E_Task/Trigger/Trigger.mpc: + * examples/E2E_Task/Trigger/Trigger_exec.h: + * examples/E2E_Task/Trigger/Trigger_exec.cpp: + * examples/E2E_Task/Workload/Workload.mpc: + * lib: + * utils/RACE_utils.cpp: + + Updates for new CIAO. + Mon Feb 2 03:05:39 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * Input_Adapters/Interactive_Input_Adapter/Admin_exec.cpp: * SA_POP/Tester/Tester_Component.mpc: * Tester/tester.mpc: - Compile fixes for Linux. - + Compile fixes for Linux. + Sun Sep 28 21:14:16 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * SA_POP/SANet/SANetFileIn.cpp: diff --git a/Conductor/Conductor.mpc b/Conductor/Conductor.mpc index 5708d06a624..e2cd6a3db0d 100644 --- a/Conductor/Conductor.mpc +++ b/Conductor/Conductor.mpc @@ -33,7 +33,7 @@ project(Conductor_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl { } } -project(Conductor_stub) : ciao_client_dnc, race_common { +project(Conductor_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Conductor_idl_gen \ OpString_stub \ @@ -68,7 +68,7 @@ project(Conductor_stub) : ciao_client_dnc, race_common { } } -project(Conductor_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(Conductor_exec) : ciao_executor, ciao_config_handlers, race_common { avoids += ace_for_tao after += Conductor_cidl_gen Conductor_stub RACE_utils sharedname = Conductor_Component_exec @@ -105,7 +105,7 @@ project(Conductor_exec) : ciao_component_dnc, ciao_config_handlers, race_common } -project(Conductor_svnt) : ciao_servant_dnc, race_common { +project(Conductor_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Conductor_exec diff --git a/Conductor/Conductor_exec.cpp b/Conductor/Conductor_exec.cpp index 49752513234..a98aac145a9 100644 --- a/Conductor/Conductor_exec.cpp +++ b/Conductor/Conductor_exec.cpp @@ -56,7 +56,7 @@ namespace CIAO } void - Conductor_Component_exec_i::ciao_postactivate () + Conductor_Component_exec_i::configuration_complete () { // Your code here. } diff --git a/Conductor/Conductor_exec.h b/Conductor/Conductor_exec.h index 609929ceeac..3dd26755797 100644 --- a/Conductor/Conductor_exec.h +++ b/Conductor/Conductor_exec.h @@ -38,7 +38,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Controller/Base/Controller_Base.mpc b/Controller/Base/Controller_Base.mpc index 617cca620db..69fe878e9ce 100644 --- a/Controller/Base/Controller_Base.mpc +++ b/Controller/Base/Controller_Base.mpc @@ -14,7 +14,7 @@ project(Controller_Base_idl_gen) : taoidldefaults, anytypecode, race_idl { } } -project(Controller_Base_stub) : ciao_client_dnc, race_common { +project(Controller_Base_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Controller_Base_idl_gen \ OpString_stub \ @@ -48,7 +48,7 @@ project(Controller_Base_stub) : ciao_client_dnc, race_common { } } -project(Controller_Base_svnt) : ciao_servant_dnc, race_common { +project(Controller_Base_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Controller_Base_stub diff --git a/Controller/Component/Controller.mpc b/Controller/Component/Controller.mpc index 05c3e0359fc..0a4f759849c 100644 --- a/Controller/Component/Controller.mpc +++ b/Controller/Component/Controller.mpc @@ -1,4 +1,4 @@ -project(Controller_stub): ciao_deployment_stub, race_idl { +project(Controller_stub): dance_deployment_stub, race_idl { after += CIAO_TargetManager_stub \ TargetManager_stub \ @@ -29,7 +29,7 @@ project(Controller_stub): ciao_deployment_stub, race_idl { } } -project(Controller_svnt) : ciao_servant_dnc, race_idl { +project(Controller_svnt) : ciao_servant, race_idl { after += Controller_stub \ CIAO_TargetManager_svnt @@ -62,7 +62,7 @@ project(Controller_svnt) : ciao_servant_dnc, race_idl { } } -project(Controller_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(Controller_exec) : ciao_executor, ciao_config_handlers, race_common { after += Controller_svnt \ XSC_Config_Handlers \ Path_stub @@ -95,7 +95,7 @@ project(Controller_exec) : ciao_component_dnc, ciao_config_handlers, race_common } -project (Controller_Starter) : ciao_client_dnc, ciao_deployment_stub, valuetype, race_common { +project (Controller_Starter) : ccm_stub, dance_deployment_stub, valuetype, race_common { exename = starter after += Controller_stub libs += Controller_stub \ diff --git a/Controller/Component/Controller_exec.cpp b/Controller/Component/Controller_exec.cpp index 332ad1ed2f1..57056588bee 100644 --- a/Controller/Component/Controller_exec.cpp +++ b/Controller/Component/Controller_exec.cpp @@ -90,7 +90,7 @@ namespace CIAO } void - Controller_exec_i::ciao_postactivate () + Controller_exec_i::configuration_complete () throw (::CORBA::SystemException, ::Components::CCMException) { try @@ -130,7 +130,7 @@ namespace CIAO catch (CORBA::Exception & ex) { ACE_PRINT_EXCEPTION (ex, "(%P|%T|%N|%l) [RACE:] Exception caught " - "in Controller_exec_i::ciao_postactivate ()"); + "in Controller_exec_i::configuration_complete ()"); } } diff --git a/Controller/Component/Controller_exec.h b/Controller/Component/Controller_exec.h index 75aeb60f3c9..a4c8cc23eea 100644 --- a/Controller/Component/Controller_exec.h +++ b/Controller/Component/Controller_exec.h @@ -61,7 +61,7 @@ namespace CIAO throw (::CORBA::SystemException, ::Components::CCMException); virtual void - ciao_postactivate () + configuration_complete () throw (::CORBA::SystemException, ::Components::CCMException); virtual void diff --git a/Controller/EUCON/EUCON_Controller.mpc b/Controller/EUCON/EUCON_Controller.mpc index c604e32baf0..0c8f7114c93 100644 --- a/Controller/EUCON/EUCON_Controller.mpc +++ b/Controller/EUCON/EUCON_Controller.mpc @@ -34,7 +34,7 @@ project(EUCON_Controller_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl } } -project(EUCON_Controller_stub) : ciao_client_dnc, race_common { +project(EUCON_Controller_stub) : ccm_stub, race_common { avoids += ace_for_tao after += EUCON_Controller_idl_gen \ Controller_Base_stub @@ -60,7 +60,7 @@ project(EUCON_Controller_stub) : ciao_client_dnc, race_common { } } -project(EUCON_Controller_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(EUCON_Controller_exec) : ciao_executor, ciao_config_handlers, race_common { avoids += ace_for_tao after += EUCON_Controller_cidl_gen EUCON_Controller_stub sharedname = EUCON_Controller_exec @@ -115,7 +115,7 @@ project(EUCON_Controller_exec) : ciao_component_dnc, ciao_config_handlers, race_ } -project(EUCON_Controller_svnt) : ciao_servant_dnc, race_common { +project(EUCON_Controller_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += EUCON_Controller_exec sharedname = EUCON_Controller_svnt diff --git a/Controller/EUCON/EUCON_Controller_exec.cpp b/Controller/EUCON/EUCON_Controller_exec.cpp index 52f13f7cb05..307b6c41b45 100644 --- a/Controller/EUCON/EUCON_Controller_exec.cpp +++ b/Controller/EUCON/EUCON_Controller_exec.cpp @@ -70,7 +70,7 @@ namespace CIAO } void - EUCON_Controller_exec_i::ciao_postactivate () + EUCON_Controller_exec_i::configuration_complete () { this->controller_ = new Controller (this->context_, this->sampling_period_); diff --git a/Controller/EUCON/EUCON_Controller_exec.h b/Controller/EUCON/EUCON_Controller_exec.h index 40aed3e2fe5..cbfb813b797 100644 --- a/Controller/EUCON/EUCON_Controller_exec.h +++ b/Controller/EUCON/EUCON_Controller_exec.h @@ -58,7 +58,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Controller/FMUF/FMUF_Controller.mpc b/Controller/FMUF/FMUF_Controller.mpc index f8ce0d099f7..64ff79813f4 100644 --- a/Controller/FMUF/FMUF_Controller.mpc +++ b/Controller/FMUF/FMUF_Controller.mpc @@ -34,7 +34,7 @@ project(FMUF_Controller_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl { } } -project(FMUF_Controller_stub) : ciao_client_dnc, race_common { +project(FMUF_Controller_stub) : ccm_stub, race_common { avoids += ace_for_tao after += FMUF_Controller_idl_gen \ Controller_Base_stub @@ -61,7 +61,7 @@ project(FMUF_Controller_stub) : ciao_client_dnc, race_common { } } -project(FMUF_Controller_exec) : ciao_component_dnc, race_common { +project(FMUF_Controller_exec) : ciao_executor, race_common { avoids += ace_for_tao after += FMUF_Controller_cidl_gen FMUF_Controller_stub sharedname = FMUF_Controller_exec @@ -101,7 +101,7 @@ project(FMUF_Controller_exec) : ciao_component_dnc, race_common { } -project(FMUF_Controller_svnt) : ciao_servant_dnc, race_common { +project(FMUF_Controller_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += FMUF_Controller_exec sharedname = FMUF_Controller_svnt diff --git a/Controller/FMUF/FMUF_Controller_exec.cpp b/Controller/FMUF/FMUF_Controller_exec.cpp index bf7b001cd05..30ec249c8da 100644 --- a/Controller/FMUF/FMUF_Controller_exec.cpp +++ b/Controller/FMUF/FMUF_Controller_exec.cpp @@ -71,7 +71,7 @@ namespace CIAO } void - FMUF_Controller_exec_i::ciao_postactivate () + FMUF_Controller_exec_i::configuration_complete () { this->controller_ = new Controller (this->context_, this->sampling_period_); diff --git a/Controller/FMUF/FMUF_Controller_exec.h b/Controller/FMUF/FMUF_Controller_exec.h index 4ae7267032b..10eea932962 100644 --- a/Controller/FMUF/FMUF_Controller_exec.h +++ b/Controller/FMUF/FMUF_Controller_exec.h @@ -58,7 +58,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Data_Base/Data_Base.mpc b/Data_Base/Data_Base.mpc index 48429482f52..e1749077fb2 100644 --- a/Data_Base/Data_Base.mpc +++ b/Data_Base/Data_Base.mpc @@ -1,4 +1,4 @@ -project(Data_Base_stub): ciao_client_dnc, ciao_deployment_stub, race_idl { +project(Data_Base_stub): ccm_stub, dance_deployment_stub, race_idl { sharedname = Data_Base_Component_stub after += OpString_stub @@ -23,7 +23,7 @@ project(Data_Base_stub): ciao_client_dnc, ciao_deployment_stub, race_idl { } } -project(Data_Base_svnt) : ciao_servant_dnc, race_idl { +project(Data_Base_svnt) : ciao_servant, race_idl { after += Data_Base_stub sharedname = Data_Base_Component_svnt libs += Data_Base_Component_stub \ @@ -52,7 +52,7 @@ project(Data_Base_svnt) : ciao_servant_dnc, race_idl { } } -project(Data_Base_exec) : ciao_component_dnc, race_common { +project(Data_Base_exec) : ciao_executor, race_common { after += Data_Base_svnt sharedname = Data_Base_Component_exec libs += Data_Base_Component_stub \ diff --git a/Data_Base/Data_Base_exec.cpp b/Data_Base/Data_Base_exec.cpp index 2ef31a15a5f..76ffc7fbdc4 100644 --- a/Data_Base/Data_Base_exec.cpp +++ b/Data_Base/Data_Base_exec.cpp @@ -50,7 +50,7 @@ namespace CIAO } void - Data_Base_Component_exec_i::ciao_postactivate () + Data_Base_Component_exec_i::configuration_complete () { } diff --git a/Data_Base/Data_Base_exec.h b/Data_Base/Data_Base_exec.h index a7d3e0fac2f..331be46a78e 100644 --- a/Data_Base/Data_Base_exec.h +++ b/Data_Base/Data_Base_exec.h @@ -48,7 +48,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Effectors/Base/Effector_Base.idl b/Effectors/Base/Effector_Base.idl index c375683b20b..06273bccd0e 100644 --- a/Effectors/Base/Effector_Base.idl +++ b/Effectors/Base/Effector_Base.idl @@ -10,7 +10,7 @@ #ifndef EFFECTOR_BASE_IDL #define EFFECTOR_BASE_IDL -#include "ciao/Components.idl" +#include "Components.idl" #include "common/OpString.idl" module CIAO diff --git a/Effectors/Base/Effector_Base.mpc b/Effectors/Base/Effector_Base.mpc index 6a2f183c398..79401e45d68 100644 --- a/Effectors/Base/Effector_Base.mpc +++ b/Effectors/Base/Effector_Base.mpc @@ -14,7 +14,7 @@ project(Effector_Base_idl_gen) : taoidldefaults, anytypecode, race_idl { } } -project(Effector_Base_stub) : ciao_client_dnc, race_common { +project(Effector_Base_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Effector_Base_idl_gen \ OpString_stub @@ -40,7 +40,7 @@ project(Effector_Base_stub) : ciao_client_dnc, race_common { } } -project(Effector_Base_svnt) : ciao_servant_dnc, race_common { +project(Effector_Base_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Effector_Base_stub sharedname = Effector_Base_svnt diff --git a/Effectors/EUCON/EUCON_Effector.mpc b/Effectors/EUCON/EUCON_Effector.mpc index dc84128691b..8ecab7f9ba9 100644 --- a/Effectors/EUCON/EUCON_Effector.mpc +++ b/Effectors/EUCON/EUCON_Effector.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl EUCON_Effector" -project(EUCON_Effector_stub) : ciao_client_dnc, ciao_deployment_stub, race_idl { +project(EUCON_Effector_stub) : ccm_stub, dance_deployment_stub, race_idl { after += Effector_Base_stub sharedname = EUCON_Effector_Component_stub libs += Effector_Base_stub @@ -34,7 +34,7 @@ project(EUCON_Effector_stub) : ciao_client_dnc, ciao_deployment_stub, race_idl { } } -project(EUCON_Effector_svnt) : ciao_servant_dnc, race_idl { +project(EUCON_Effector_svnt) : ciao_servant, race_idl { after += EUCON_Effector_stub \ Effector_Base_svnt @@ -77,7 +77,7 @@ project(EUCON_Effector_svnt) : ciao_servant_dnc, race_idl { } } -project(EUCON_Effector_exec) : ciao_component_dnc, race_common { +project(EUCON_Effector_exec) : ciao_executor, race_common { after += EUCON_Effector_svnt \ Callback_stub \ OpString_stub diff --git a/Effectors/EUCON/EUCON_Effector_exec.cpp b/Effectors/EUCON/EUCON_Effector_exec.cpp index c8a8531b746..0d8dde90287 100644 --- a/Effectors/EUCON/EUCON_Effector_exec.cpp +++ b/Effectors/EUCON/EUCON_Effector_exec.cpp @@ -67,7 +67,7 @@ namespace CIAO } void - EUCON_Effector_exec_i::ciao_postactivate () + EUCON_Effector_exec_i::configuration_complete () { // Your code here. } diff --git a/Effectors/EUCON/EUCON_Effector_exec.h b/Effectors/EUCON/EUCON_Effector_exec.h index abbb01b01a9..2a355b38d62 100644 --- a/Effectors/EUCON/EUCON_Effector_exec.h +++ b/Effectors/EUCON/EUCON_Effector_exec.h @@ -43,7 +43,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Input_Adapters/Base/Input_Adapter_Base.mpc b/Input_Adapters/Base/Input_Adapter_Base.mpc index b6bfa59ce1d..eefb81b2c6e 100644 --- a/Input_Adapters/Base/Input_Adapter_Base.mpc +++ b/Input_Adapters/Base/Input_Adapter_Base.mpc @@ -15,7 +15,7 @@ project(Input_Adapter_Base_idl_gen) : taoidldefaults, anytypecode, race_idl { } } -project(Input_Adapter_Base_stub) : ciao_client_dnc, race_common { +project(Input_Adapter_Base_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Input_Adapter_Base_idl_gen Conductor_stub libs += Conductor_Component_stub @@ -40,7 +40,7 @@ project(Input_Adapter_Base_stub) : ciao_client_dnc, race_common { } } -project(Input_Adapter_Base_svnt) : ciao_servant_dnc, race_common { +project(Input_Adapter_Base_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Input_Adapter_Base_stub sharedname = Input_Adapter_Base_svnt diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl index 29037e37a2b..dff4c3f4a3f 100644 --- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl +++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.cidl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #ifndef RACE_INTERACTIVE_INPUT_ADAPTER_CIDL #define RACE_INTERACTIVE_INPUT_ADAPTER_CIDL diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc index d48eb3fee03..fba552e7642 100644 --- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc +++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc @@ -32,7 +32,7 @@ project(Interactive_Input_Adapter_cidl_gen) : ciaocidldefaults, taoidldefaults, } } -project(Interactive_Input_Adapter_stub) : ciao_client_dnc, race_common { +project(Interactive_Input_Adapter_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Interactive_Input_Adapter_idl_gen \ Input_Adapter_Base_stub \ @@ -60,7 +60,7 @@ project(Interactive_Input_Adapter_stub) : ciao_client_dnc, race_common { } } -project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(Interactive_Input_Adapter_exec) : ciao_executor, ciao_config_handlers, race_common { avoids += ace_for_tao after += Interactive_Input_Adapter_cidl_gen \ Interactive_Input_Adapter_stub \ @@ -98,7 +98,7 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle } -project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc, race_common { +project(Interactive_Input_Adapter_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Interactive_Input_Adapter_exec \ Input_Adapter_Base_svnt diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp index 6e14b6ddbba..ff92e1dd72f 100644 --- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp +++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp @@ -50,7 +50,7 @@ namespace CIAO } void - Interactive_IA_Component_exec_i::ciao_postactivate () + Interactive_IA_Component_exec_i::configuration_complete () { } diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h index 5ae4f84d481..6b62123076e 100644 --- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h +++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h @@ -41,7 +41,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl index 1e44d7ab6ac..f60bf2bd352 100644 --- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl +++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.cidl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #ifndef RACE_SA_POP_INPUT_ADAPTER_CIDL #define RACE_SA_POP_INPUT_ADAPTER_CIDL #include "SA_POP_Input_Adapter.idl" diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc index 88eb0ea610f..48103e9f94e 100644 --- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc +++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter.mpc @@ -1,4 +1,4 @@ -project(SA_POP_Input_Adapter_stub): ciao_client_dnc, ciao_deployment_stub, race_idl { +project(SA_POP_Input_Adapter_stub): ccm_stub, dance_deployment_stub, race_idl { sharedname = SA_POP_IA_Component_stub @@ -27,7 +27,7 @@ project(SA_POP_Input_Adapter_stub): ciao_client_dnc, ciao_deployment_stub, race_ } } -project(SA_POP_Input_Adapter_svnt) : ciao_servant_dnc, race_idl { +project(SA_POP_Input_Adapter_svnt) : ciao_servant, race_idl { sharedname = SA_POP_IA_Component_svnt @@ -64,7 +64,7 @@ project(SA_POP_Input_Adapter_svnt) : ciao_servant_dnc, race_idl { } } -project(SA_POP_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handlers, race_common { +project(SA_POP_Input_Adapter_exec) : ciao_executor, ciao_config_handlers, race_common { sharedname = SA_POP_IA_Component_exec diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp index 6d239a99731..abbbbf2c379 100644 --- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp +++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.cpp @@ -49,7 +49,7 @@ namespace CIAO } void - SA_POP_IA_Component_exec_i::ciao_postactivate () + SA_POP_IA_Component_exec_i::configuration_complete () { } diff --git a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h index 8552a1c81d2..8cca4e5be8c 100644 --- a/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h +++ b/Input_Adapters/SA_POP_Input_Adapter/SA_POP_Input_Adapter_exec.h @@ -31,7 +31,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Monitor/Central_Monitor/Monitor.mpc b/Monitor/Central_Monitor/Monitor.mpc index 4dca5bda420..972b9ef7125 100644 --- a/Monitor/Central_Monitor/Monitor.mpc +++ b/Monitor/Central_Monitor/Monitor.mpc @@ -33,7 +33,7 @@ // } // } -project(Monitor_stub): ciao_client_dnc, race_idl { +project(Monitor_stub): ccm_stub, race_idl { sharedname = Monitor_stub idlflags += -Wb,stub_export_macro=MONITOR_STUB_Export \ @@ -51,7 +51,7 @@ project(Monitor_stub): ciao_client_dnc, race_idl { } } -project(Monitor_svnt) : ciao_servant_dnc, race_idl { +project(Monitor_svnt) : ciao_servant, race_idl { after += Monitor_stub sharedname = Monitor_svnt libs += Monitor_stub @@ -76,7 +76,7 @@ project(Monitor_svnt) : ciao_servant_dnc, race_idl { } -project(Monitor_exec) : ciao_component_dnc, race_common { +project(Monitor_exec) : ciao_executor, race_common { after += Monitor_svnt sharedname = Monitor_exec libs += Monitor_stub Monitor_svnt diff --git a/Monitor/Central_Monitor/Monitor_exec.cpp b/Monitor/Central_Monitor/Monitor_exec.cpp index 8e6f5b4403e..1ff0d689962 100644 --- a/Monitor/Central_Monitor/Monitor_exec.cpp +++ b/Monitor/Central_Monitor/Monitor_exec.cpp @@ -153,7 +153,7 @@ namespace CIAO } void - Central_Monitor_exec_i::ciao_postactivate () + Central_Monitor_exec_i::configuration_complete () throw (::CORBA::SystemException, ::Components::CCMException) { diff --git a/Monitor/Central_Monitor/Monitor_exec.h b/Monitor/Central_Monitor/Monitor_exec.h index 2a1db24229a..64502d5b8dd 100644 --- a/Monitor/Central_Monitor/Monitor_exec.h +++ b/Monitor/Central_Monitor/Monitor_exec.h @@ -53,7 +53,7 @@ namespace CIAO virtual void ciao_preactivate () throw (::CORBA::SystemException, ::Components::CCMException); - virtual void ciao_postactivate () + virtual void configuration_complete () throw (::CORBA::SystemException, ::Components::CCMException); virtual void ccm_activate () diff --git a/Monitor/Local_Monitor/Local_Monitor.mpc b/Monitor/Local_Monitor/Local_Monitor.mpc index 8be736fee6e..fb5b857c705 100644 --- a/Monitor/Local_Monitor/Local_Monitor.mpc +++ b/Monitor/Local_Monitor/Local_Monitor.mpc @@ -1,4 +1,4 @@ -project(Local_Monitor): ciao_client_dnc, naming, ciao_race_default, portableserver{ +project(Local_Monitor): ccm_stub, naming, ciao_race_default, portableserver{ sharedname = Local_Monitor after += Monitor_stub libs += Monitor_stub diff --git a/Output_Adapters/Base/Output_Adapter.mpc b/Output_Adapters/Base/Output_Adapter.mpc index bd0d2242d84..80b84d19ed0 100644 --- a/Output_Adapters/Base/Output_Adapter.mpc +++ b/Output_Adapters/Base/Output_Adapter.mpc @@ -2,7 +2,7 @@ //Output_Adapter.mpc,v 1.3 2005/09/27 18:20:01 wotte Exp // This file is generated with "generate_component_mpc.pl -n Planner" -project(Output_Adapter_stub): ciao_deployment_stub, ciao_race_component , race_idl { +project(Output_Adapter_stub): dance_deployment_stub, ciao_race_component , race_idl { after += Output_Adapter_Interface_stub sharedname = Output_Adapter_stub @@ -31,7 +31,7 @@ project(Output_Adapter_stub): ciao_deployment_stub, ciao_race_component , race_i } } -project(Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component , race_idl { +project(Output_Adapter_svnt) : ciao_servant, ciao_race_component , race_idl { after += Output_Adapter_stub Output_Adapter_Interface_svnt sharedname = Output_Adapter_svnt diff --git a/Output_Adapters/Component/Output_Manager.mpc b/Output_Adapters/Component/Output_Manager.mpc index 9bc8f0db871..6662c3bc11f 100644 --- a/Output_Adapters/Component/Output_Manager.mpc +++ b/Output_Adapters/Component/Output_Manager.mpc @@ -1,4 +1,4 @@ -project(Output_Manager_stub): ciao_deployment_stub, ciao_race_component , race_idl { +project(Output_Manager_stub): dance_deployment_stub, ciao_race_component , race_idl { after += Output_Adapter_Interface_stub @@ -22,7 +22,7 @@ project(Output_Manager_stub): ciao_deployment_stub, ciao_race_component , race_i } } -project(Output_Manager_svnt) : ciao_servant_dnc, ciao_race_component , race_idl { +project(Output_Manager_svnt) : ciao_servant, ciao_race_component , race_idl { after += Output_Manager_stub sharedname = Output_Manager_svnt libs += Output_Manager_stub \ @@ -50,7 +50,7 @@ project(Output_Manager_svnt) : ciao_servant_dnc, ciao_race_component , race_idl } -project(Output_Manager_exec) : ciao_component_dnc, ciao_race_component , race_common { +project(Output_Manager_exec) : ciao_executor, ciao_race_component , race_common { after += Output_Manager_svnt sharedname = Output_Manager_exec libs += Output_Manager_stub \ diff --git a/Output_Adapters/Component/Output_Manager_exec.cpp b/Output_Adapters/Component/Output_Manager_exec.cpp index 5ec78e26696..5718d3844b2 100644 --- a/Output_Adapters/Component/Output_Manager_exec.cpp +++ b/Output_Adapters/Component/Output_Manager_exec.cpp @@ -108,7 +108,7 @@ namespace CIAO } void - Output_Manager_exec_i::ciao_postactivate ( + Output_Manager_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Output_Adapters/Component/Output_Manager_exec.h b/Output_Adapters/Component/Output_Manager_exec.h index 65fd299ae8d..6ec79103769 100644 --- a/Output_Adapters/Component/Output_Manager_exec.h +++ b/Output_Adapters/Component/Output_Manager_exec.h @@ -78,7 +78,7 @@ namespace CIAO ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp index 135ec3fbc93..56b94eb886f 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp +++ b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.cpp @@ -1,7 +1,8 @@ #include "Admin_exec.h" #include "ciao/CIAO_common.h" +#include "ciao/Containers/Container_Base.h" #include "Config_Handlers/DP_Handler.h" -#include "Config_Handlers/Utils/XML_Helper.h" +#include "Config_Handlers/XML_Typedefs.h" #include "Config_Handlers/Deployment.hpp" #include "Config_Handlers/DnC_Dump.h" #include <sstream> @@ -18,15 +19,15 @@ namespace CIAO DAnCE_OA_Component_Context *context, const char * repoman_id, Logger &logger) - : context_ (context), + : Plan_Launcher_Base_Impl (dynamic_cast<CIAO::Container_i *> + (this->context_->_ciao_the_Container ())->the_ORB (), + 0, + 0), + context_ (context), repoman_id_ (CORBA::string_dup (repoman_id)), repoman_ (false), logger_ (logger) { - this->launcher_.init ( - 0, - this->context_->_ciao_the_Container ()->the_ORB ()); - std::string msg; if (this->repoman_id_.in () != 0) @@ -36,10 +37,9 @@ namespace CIAO this->logger_.log (msg); - if (this->plan_gen_.init ( - this->context_->_ciao_the_Container ()->the_ORB (), - true, - this->repoman_id_.in ())) + if (this->plan_gen_.init (dynamic_cast <CIAO::Container_i *> (this->context_->_ciao_the_Container ())->the_ORB (), + true, + this->repoman_id_.in ())) { this->repoman_ = true; msg = "Done!"; @@ -79,7 +79,7 @@ namespace CIAO // delete the_xsc; // Now do the remaining stuff. // Deployment::DnC_Dump::dump (plan); - ACE_CString uuid (this->launcher_.launch_plan (plan)); + ACE_CString uuid (this->launch_plan (plan)); std::string msg; if (uuid.c_str () == 0) { @@ -97,7 +97,7 @@ namespace CIAO } } - catch (Plan_Launcher::Plan_Launcher_i::Deployment_Failure &) + catch (Plan_Launcher_Base_Impl::Deployment_Failure &) { std::string msg = "Exception caught::Unable to " "launch plan with UUID "; @@ -110,9 +110,12 @@ namespace CIAO bool Admin_exec_i::redeploy_plan (const ::Deployment::DeploymentPlan &plan) { + throw CORBA::NO_IMPLEMENT (); + + /* try { - ACE_CString uuid (this->launcher_.re_launch_plan (plan)); + ACE_CString uuid (this->re_launch_plan (plan)); if (uuid.c_str () == 0) { @@ -138,6 +141,7 @@ namespace CIAO this->logger_.log (msg); } return false; + */ } ::CORBA::Boolean @@ -291,7 +295,7 @@ namespace CIAO std::stringstream msg; try { - if (this->launcher_.teardown_plan(ID)) + if (this->teardown_plan(ID)) { msg << "DANCE_OA::tear_down_string(): " << "successfully torn down plan with UUID " diff --git a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h index 4ce04c3e1fa..431c110f851 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h +++ b/Output_Adapters/DAnCE_Output_Adapter/Admin_exec.h @@ -5,7 +5,7 @@ #include "DAnCE_Output_Adapter_exec_export.h" #include "tao/LocalObject.h" -#include "Plan_Launcher/Plan_Launcher_Impl.h" +#include "Plan_Launcher/Plan_Launcher_Base_Impl.h" #include "Plan_Generator_Impl.h" #include "Logger.h" @@ -19,12 +19,13 @@ namespace CIAO { class DANCE_OUTPUT_ADAPTER_EXEC_Export Admin_exec_i : public virtual ::CIAO::RACE::DAnCE_OA::CCM_Admin, - public virtual TAO_Local_RefCounted_Object + public virtual TAO_Local_RefCounted_Object, + public DAnCE::Plan_Launcher::Plan_Launcher_Base_Impl { public: Admin_exec_i (DAnCE_OA_Component_Context *context, - const char * repoman_id, - Logger &logger); + const char * repoman_id, + Logger &logger); virtual ~Admin_exec_i (void); @@ -55,9 +56,6 @@ namespace CIAO /// Pointer to the component's context object. DAnCE_OA_Component_Context *context_; - /// PlanLauncher object. - Plan_Launcher::Plan_Launcher_i launcher_; - /// ID of the repoman. CORBA::String_var repoman_id_; diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc index 72be1957e16..53d93c105a9 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc +++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc @@ -1,4 +1,4 @@ -project(DAnCE_Output_Adapter_stub): ciao_deployment_stub, race_idl { +project(DAnCE_Output_Adapter_stub): dance_deployment_stub, race_idl { after += OpString_stub Data_Base_stub libs += Data_Base_Component_stub OpString_stub RACE_common_stub @@ -27,7 +27,7 @@ project(DAnCE_Output_Adapter_stub): ciao_deployment_stub, race_idl { } } -project(DAnCE_Output_Adapter_svnt) : ciao_servant_dnc, race_idl { +project(DAnCE_Output_Adapter_svnt) : ciao_servant, race_idl { // , // , ciao_race_component { after += DAnCE_Output_Adapter_stub @@ -68,17 +68,17 @@ project(DAnCE_Output_Adapter_svnt) : ciao_servant_dnc, race_idl { } -project(DAnCE_Output_Adapter_exec) : ciao_component_dnc, ciao_plan_generator, ciao_config_handlers, ciao_deployment_stub, race_common { +project(DAnCE_Output_Adapter_exec) : ciao_executor, ciao_plan_generator, ciao_config_handlers, dance_deployment_stub, race_common { // , ciao_race_component, ciao_config_handlers, ciao_plan_generator { after += DAnCE_Output_Adapter_svnt RACE_utils sharedname = DAnCE_OA_Component_exec includes += $(RACE_ROOT)/utils - libs += Data_Base_Component_stub DAnCE_Utils TAO_RTCORBA ExecutionManager_stub + libs += Data_Base_Component_stub DAnCE_Utils TAO_RTCORBA DAnCE_ExecutionManager_stub libs += OpString_stub \ RACE_common_stub \ DAnCE_OA_Component_stub \ DAnCE_OA_Component_svnt \ - Plan_Launcher_Impl \ + DAnCE_Plan_Launcher \ RACE_utils // ExecutionManager_stub \ // Output_Adapter_stub \ diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp index d0e95e2d587..6d207b8cf67 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp +++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.cpp @@ -63,7 +63,7 @@ namespace CIAO } void - DAnCE_OA_Component_exec_i::ciao_postactivate () + DAnCE_OA_Component_exec_i::configuration_complete () { } diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h index daa1ceb9787..ce6713c6ac9 100644 --- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h +++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter_exec.h @@ -35,7 +35,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/Output_Adapters/Interface/Output_Adapter_Interface.mpc index c20603fda6b..7aa9e60abba 100644 --- a/Output_Adapters/Interface/Output_Adapter_Interface.mpc +++ b/Output_Adapters/Interface/Output_Adapter_Interface.mpc @@ -1,4 +1,4 @@ -project(Output_Adapter_Interface_stub): ciao_deployment_stub, ciao_race_component , race_idl { +project(Output_Adapter_Interface_stub): dance_deployment_stub, ciao_race_component , race_idl { sharedname = Output_Adapter_Interface_stub idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \ @@ -24,7 +24,7 @@ project(Output_Adapter_Interface_stub): ciao_deployment_stub, ciao_race_componen } } -project(Output_Adapter_Interface_svnt) : ciao_servant_dnc, ciao_race_component , race_common { +project(Output_Adapter_Interface_svnt) : ciao_servant, ciao_race_component , race_common { after += Output_Adapter_Interface_stub sharedname = Output_Adapter_Interface_svnt diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc index 7140f29dd60..e65267e6349 100644 --- a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc +++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc @@ -1,4 +1,4 @@ -project(XML_Output_Adapter_stub): ciao_deployment_stub, ciao_race_component , race_idl { +project(XML_Output_Adapter_stub): dance_deployment_stub, ciao_race_component , race_idl { after += Output_Adapter_stub sharedname = XML_Output_Adapter_stub @@ -22,7 +22,7 @@ project(XML_Output_Adapter_stub): ciao_deployment_stub, ciao_race_component , ra } } -project(XML_Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component , race_idl { +project(XML_Output_Adapter_svnt) : ciao_servant, ciao_race_component , race_idl { after += Output_Adapter_svnt XML_Output_Adapter_stub sharedname = XML_Output_Adapter_svnt libs += XML_Output_Adapter_stub \ @@ -51,7 +51,7 @@ project(XML_Output_Adapter_svnt) : ciao_servant_dnc, ciao_race_component , race_ } -project(XML_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component, ciao_config_handlers , race_common { +project(XML_Output_Adapter_exec) : ciao_executor, ciao_race_component, ciao_config_handlers , race_common { after += XML_Output_Adapter_svnt sharedname = XML_Output_Adapter_exec libs += XML_Output_Adapter_stub \ diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp index 3e3441e397c..2bfac33ad95 100644 --- a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp +++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp @@ -119,7 +119,7 @@ namespace CIAO } void - XML_Output_Adapter_exec_i::ciao_postactivate ( + XML_Output_Adapter_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h index 21ee06f7518..3b0911b883f 100644 --- a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h +++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h @@ -79,7 +79,7 @@ namespace CIAO ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Plan_Analyzer/Component/Plan_Analyzer.mpc b/Plan_Analyzer/Component/Plan_Analyzer.mpc index 5b6232ec40e..37bbec9434c 100644 --- a/Plan_Analyzer/Component/Plan_Analyzer.mpc +++ b/Plan_Analyzer/Component/Plan_Analyzer.mpc @@ -1,4 +1,4 @@ -project(Plan_Analyzer_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Plan_Analyzer_stub): dance_deployment_stub, ciao_race_component, race_idl { after += Plan_Analyzer_Interface_stub \ Planner_Manager_Interface_stub \ Analyzer_I_stub @@ -33,7 +33,7 @@ project(Plan_Analyzer_stub): ciao_deployment_stub, ciao_race_component, race_idl } } -project(Plan_Analyzer_svnt) : ciao_servant_dnc, ciao_race_component, race_idl { +project(Plan_Analyzer_svnt) : ciao_servant, ciao_race_component, race_idl { after += Plan_Analyzer_stub \ Plan_Analyzer_Interface_svnt sharedname = Plan_Analyzer_svnt @@ -76,7 +76,7 @@ project(Plan_Analyzer_svnt) : ciao_servant_dnc, ciao_race_component, race_idl { } -project(Plan_Analyzer_exec) : ciao_component_dnc, ciao_race_component, race_common { +project(Plan_Analyzer_exec) : ciao_executor, ciao_race_component, race_common { after += Plan_Analyzer_svnt sharedname = Plan_Analyzer_exec libs += Plan_Analyzer_stub \ diff --git a/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp b/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp index accc7a8967c..2e2804a7f96 100644 --- a/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp +++ b/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp @@ -175,7 +175,7 @@ namespace CIAO } void - Plan_Analyzer_exec_i::ciao_postactivate ( + Plan_Analyzer_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Plan_Analyzer/Component/Plan_Analyzer_exec.h b/Plan_Analyzer/Component/Plan_Analyzer_exec.h index fee03cf3eee..c44f0bdb6c0 100644 --- a/Plan_Analyzer/Component/Plan_Analyzer_exec.h +++ b/Plan_Analyzer/Component/Plan_Analyzer_exec.h @@ -101,7 +101,7 @@ namespace CIAO ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc index cfb70c27414..68767bbdd86 100644 --- a/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc +++ b/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc @@ -1,4 +1,4 @@ -project(Plan_Analyzer_Interface_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Plan_Analyzer_Interface_stub): dance_deployment_stub, ciao_race_component, race_idl { sharedname = Plan_Analyzer_Interface_stub idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \ @@ -24,7 +24,7 @@ project(Plan_Analyzer_Interface_stub): ciao_deployment_stub, ciao_race_component } } -project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc, ciao_race_component, race_common { +project(Plan_Analyzer_Interface_svnt) : ciao_servant, ciao_race_component, race_common { after += Plan_Analyzer_Interface_stub sharedname = Plan_Analyzer_Interface_svnt @@ -48,7 +48,7 @@ project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc, ciao_race_component, r } } -project(Analyzer_I_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Analyzer_I_stub): dance_deployment_stub, ciao_race_component, race_idl { sharedname = Analyzer_I_stub idlflags += -Wb,stub_export_macro=ANALYZER_I_STUB_Export \ -Wb,stub_export_include=Analyzer_I_stub_export.h \ @@ -75,7 +75,7 @@ project(Analyzer_I_stub): ciao_deployment_stub, ciao_race_component, race_idl { } -project(Analyzer_I_svnt) : ciao_servant_dnc, ciao_race_component, race_common { +project(Analyzer_I_svnt) : ciao_servant, ciao_race_component, race_common { after += Analyzer_I_stub sharedname = Analyzer_I_svnt libs += Analyzer_I_stub diff --git a/Planner_Manager/Component/Planner_Manager.mpc b/Planner_Manager/Component/Planner_Manager.mpc index cdd5aa9e0e6..7fbda62b557 100644 --- a/Planner_Manager/Component/Planner_Manager.mpc +++ b/Planner_Manager/Component/Planner_Manager.mpc @@ -1,4 +1,4 @@ -project(Planner_Manager_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Planner_Manager_stub): dance_deployment_stub, ciao_race_component, race_idl { after += Planner_Manager_Interface_stub \ Planner_Interface_stub \ Output_Adapter_Interface_stub @@ -33,7 +33,7 @@ project(Planner_Manager_stub): ciao_deployment_stub, ciao_race_component, race_i } } -project(Planner_Manager_svnt) : ciao_servant_dnc, ciao_race_component, race_idl { +project(Planner_Manager_svnt) : ciao_servant, ciao_race_component, race_idl { after += Planner_Manager_stub \ Planner_Manager_Interface_svnt sharedname = Planner_Manager_svnt @@ -80,7 +80,7 @@ project(Planner_Manager_svnt) : ciao_servant_dnc, ciao_race_component, race_idl } -project(Planner_Manager_exec) : ciao_component_dnc, ciao_race_component, race_common { +project(Planner_Manager_exec) : ciao_executor, ciao_race_component, race_common { after += Planner_Manager_svnt Planner_stub sharedname = Planner_Manager_exec libs += Planner_Manager_stub \ diff --git a/Planner_Manager/Component/Planner_Manager_exec.cpp b/Planner_Manager/Component/Planner_Manager_exec.cpp index e4f18e77b39..94646ba933e 100644 --- a/Planner_Manager/Component/Planner_Manager_exec.cpp +++ b/Planner_Manager/Component/Planner_Manager_exec.cpp @@ -513,7 +513,7 @@ namespace CIAO } void - Planner_Manager_exec_i::ciao_postactivate ( + Planner_Manager_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Planner_Manager/Component/Planner_Manager_exec.h b/Planner_Manager/Component/Planner_Manager_exec.h index c136eacb844..304e0184c7a 100644 --- a/Planner_Manager/Component/Planner_Manager_exec.h +++ b/Planner_Manager/Component/Planner_Manager_exec.h @@ -115,7 +115,7 @@ namespace CIAO ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/Planner_Manager/Interface/Planner_Manager_Interface.mpc index 5d956bba34c..5cb96426734 100644 --- a/Planner_Manager/Interface/Planner_Manager_Interface.mpc +++ b/Planner_Manager/Interface/Planner_Manager_Interface.mpc @@ -1,4 +1,4 @@ -project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode, ciao_race_component, race_idl { +project(Planner_Manager_Interface_stub): dance_deployment_stub, anytypecode, ciao_race_component, race_idl { sharedname = Planner_Manager_Interface_stub after += RACE_common_stub @@ -27,7 +27,7 @@ project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode, ciao } } -project(Planner_Manager_Interface_svnt) : ciao_servant_dnc, ciao_race_component, race_common { +project(Planner_Manager_Interface_svnt) : ciao_servant, ciao_race_component, race_common { after += Planner_Manager_Interface_stub sharedname = Planner_Manager_Interface_svnt diff --git a/Planners/Base/Planner.mpc b/Planners/Base/Planner.mpc index 1bb0de6ba91..00b6f757657 100644 --- a/Planners/Base/Planner.mpc +++ b/Planners/Base/Planner.mpc @@ -1,4 +1,4 @@ -project(Planner_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Planner_stub): dance_deployment_stub, ciao_race_component, race_idl { after += Planner_Interface_stub RACE_common_stub sharedname = Planner_stub @@ -27,7 +27,7 @@ project(Planner_stub): ciao_deployment_stub, ciao_race_component, race_idl { } } -project(Planner_svnt) : ciao_servant_dnc, ciao_race_component , race_common { +project(Planner_svnt) : ciao_servant, ciao_race_component , race_common { after += Planner_Interface_svnt Planner_stub sharedname = Planner_svnt diff --git a/Planners/Interface/Planner_Interface.mpc b/Planners/Interface/Planner_Interface.mpc index 2ad64a026be..cbbe8512fe9 100644 --- a/Planners/Interface/Planner_Interface.mpc +++ b/Planners/Interface/Planner_Interface.mpc @@ -1,4 +1,4 @@ -project(Planner_Interface_stub): ciao_deployment_stub, ciao_race_component , race_idl { +project(Planner_Interface_stub): dance_deployment_stub, ciao_race_component , race_idl { sharedname = Planner_Interface_stub @@ -25,7 +25,7 @@ project(Planner_Interface_stub): ciao_deployment_stub, ciao_race_component , rac } } -project(Planner_Interface_svnt) : ciao_servant_dnc, ciao_race_component , race_common { +project(Planner_Interface_svnt) : ciao_servant, ciao_race_component , race_common { after += Planner_Interface_stub sharedname = Planner_Interface_svnt diff --git a/Planners/StaticPlanner/StaticPlanner.mpc b/Planners/StaticPlanner/StaticPlanner.mpc index 0481efd49ff..42e0f5d461e 100644 --- a/Planners/StaticPlanner/StaticPlanner.mpc +++ b/Planners/StaticPlanner/StaticPlanner.mpc @@ -1,4 +1,4 @@ -project(Planner_StaticPlanner_stub): ciao_deployment_stub, ciao_race_component, race_idl { +project(Planner_StaticPlanner_stub): dance_deployment_stub, ciao_race_component, race_idl { after += Planner_stub Planner_Interface_stub libs += Planner_stub Planner_Interface_stub sharedname = StaticPlanner_stub @@ -18,7 +18,7 @@ project(Planner_StaticPlanner_stub): ciao_deployment_stub, ciao_race_component, } } -project(Planner_StaticPlanner_svnt) : ciao_servant_dnc, ciao_race_component, race_idl { +project(Planner_StaticPlanner_svnt) : ciao_servant, ciao_race_component, race_idl { after += Planner_svnt Planner_StaticPlanner_stub Planner_Interface_svnt sharedname = StaticPlanner_svnt libs += StaticPlanner_stub Planner_stub Planner_svnt \ @@ -45,7 +45,7 @@ project(Planner_StaticPlanner_svnt) : ciao_servant_dnc, ciao_race_component, rac } -project(Planner_StaticPlanner_exec) : ciao_component_dnc, ciao_race_component, race_common { +project(Planner_StaticPlanner_exec) : ciao_executor, ciao_race_component, race_common { after += Planner_StaticPlanner_svnt sharedname = StaticPlanner_exec libs += StaticPlanner_stub\ diff --git a/Planners/StaticPlanner/StaticPlanner_exec.cpp b/Planners/StaticPlanner/StaticPlanner_exec.cpp index a5ea4f68633..82722ed0a8e 100644 --- a/Planners/StaticPlanner/StaticPlanner_exec.cpp +++ b/Planners/StaticPlanner/StaticPlanner_exec.cpp @@ -298,7 +298,7 @@ namespace CIAO } void - StaticPlanner_exec_i::ciao_postactivate ( + StaticPlanner_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/Planners/StaticPlanner/StaticPlanner_exec.h b/Planners/StaticPlanner/StaticPlanner_exec.h index 08b52e46aec..9585e5023b1 100644 --- a/Planners/StaticPlanner/StaticPlanner_exec.h +++ b/Planners/StaticPlanner/StaticPlanner_exec.h @@ -147,7 +147,7 @@ namespace CIAO ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/Component/SA_POP_Component.mpc b/SA_POP/Component/SA_POP_Component.mpc index b4f0829b1bc..043a6c79992 100644 --- a/SA_POP/Component/SA_POP_Component.mpc +++ b/SA_POP/Component/SA_POP_Component.mpc @@ -1,6 +1,6 @@ // $Id$ -project(SA_POP_Component_stub): ciao_client_dnc, ciao_deployment_stub, race_idl { +project(SA_POP_Component_stub): ccm_stub, dance_deployment_stub, race_idl { sharedname = SA_POP_Component_stub after += OpString_stub Data_Base_stub SA_POP @@ -26,7 +26,7 @@ project(SA_POP_Component_stub): ciao_client_dnc, ciao_deployment_stub, race_idl } } -project(SA_POP_Component_svnt) : ciao_servant_dnc, race_idl { +project(SA_POP_Component_svnt) : ciao_servant, race_idl { after += SA_POP_Component_stub sharedname = SA_POP_Component_svnt libs += SA_POP_Component_stub \ @@ -59,7 +59,7 @@ project(SA_POP_Component_svnt) : ciao_servant_dnc, race_idl { } } -project(SA_POP_Component_exec) : ciao_component_dnc, ciao_config_handlers , race_common { +project(SA_POP_Component_exec) : ciao_executor, ciao_config_handlers , race_common { after += SA_POP_Component_svnt sharedname = SA_POP_Component_exec diff --git a/SA_POP/Component/SA_POP_Component_exec.cpp b/SA_POP/Component/SA_POP_Component_exec.cpp index 6c2126b2baa..2176be0540c 100644 --- a/SA_POP/Component/SA_POP_Component_exec.cpp +++ b/SA_POP/Component/SA_POP_Component_exec.cpp @@ -115,7 +115,7 @@ namespace CIAO } void - SA_POP_Component_exec_i::ciao_postactivate () + SA_POP_Component_exec_i::configuration_complete () { // Your code here. } diff --git a/SA_POP/Component/SA_POP_Component_exec.h b/SA_POP/Component/SA_POP_Component_exec.h index 8658eccc35c..b93238ddd08 100644 --- a/SA_POP/Component/SA_POP_Component_exec.h +++ b/SA_POP/Component/SA_POP_Component_exec.h @@ -90,7 +90,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/SA_POP/SANet/SANetFileIn.cpp b/SA_POP/SANet/SANetFileIn.cpp index e0ac60814db..e72f47656af 100644 --- a/SA_POP/SANet/SANetFileIn.cpp +++ b/SA_POP/SANet/SANetFileIn.cpp @@ -19,7 +19,7 @@ #include "Builder.h" #endif -#include "Utils/XML_Helper.h" +#include "SA_POP_XML_Typedefs.h" #include "XML_SANet.hpp" using namespace SANet; @@ -36,19 +36,20 @@ SANetFileIn::~SANetFileIn (void) // Nothing to do. }; +using SA_POP::XML::XML_Helper; + // Build network from XML file. Network *SANetFileIn::build_net (std::string filename) { - CIAO::Config_Handlers::XML_Helper helper; - if (!helper.is_initialized ()) + if (!XML_Helper::XML_HELPER.is_initialized ()) return 0; // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = #if defined (SA_POP_HAS_CIAO) - helper.create_dom (filename.c_str ()); + XML_Helper::XML_HELPER.create_dom (filename.c_str ()); #else - helper.create_dom (filename.c_str (), ""); + XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); #endif /* SA_POP_HAS_CIAO */ if (!dom) return 0; @@ -150,16 +151,15 @@ Network *SANetFileIn::build_net (std::string filename) // Build network from XML file. void SANetFileIn::build_net (std::string filename, SA_POP::Builder *builder) { - CIAO::Config_Handlers::XML_Helper helper; - if (!helper.is_initialized ()) + if (!XML_Helper::XML_HELPER.is_initialized ()) return; // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = #if defined (SA_POP_HAS_CIAO) - helper.create_dom (filename.c_str ()); + XML_Helper::XML_HELPER.create_dom (filename.c_str ()); #else - helper.create_dom (filename.c_str (), ""); + XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); #endif /* SA_POP_HAS_CIAO */ if (!dom) return; diff --git a/SA_POP/SAPOP_w_ACE.mpc b/SA_POP/SAPOP_w_ACE.mpc index 96261606c43..5ef1788611c 100644 --- a/SA_POP/SAPOP_w_ACE.mpc +++ b/SA_POP/SAPOP_w_ACE.mpc @@ -68,7 +68,7 @@ project(SA_POP) : xerces, acelib { Source_Files { SA_POP_Exceptions.cpp - + SA_POP_XML_Typedefs.cpp SA_Builder.cpp Planner.cpp diff --git a/SA_POP/SA_POP_XML_Typedefs.cpp b/SA_POP/SA_POP_XML_Typedefs.cpp new file mode 100644 index 00000000000..4030d3c0bd9 --- /dev/null +++ b/SA_POP/SA_POP_XML_Typedefs.cpp @@ -0,0 +1,14 @@ +// $Id$ + +#include "XML_Typedefs.h" + +namespace SA_POP +{ + namespace XML + { + XML_Helper::PATH_RESOLVER XML_Helper::_path_resolver; + XML_Helper::XML_RESOLVER XML_Helper::_xml_resolver (XML_Helper::_path_resolver); + XML_Helper::ERROR_HANDLER XML_Helper::_xml_error_handler; + XML_Helper::HELPER XML_Helper::XML_HELPER (XML_Helper::_xml_resolver, XML_Helper::_xml_error_handler); + } +} diff --git a/SA_POP/SA_POP_XML_Typedefs.h b/SA_POP/SA_POP_XML_Typedefs.h new file mode 100644 index 00000000000..332314c4ea9 --- /dev/null +++ b/SA_POP/SA_POP_XML_Typedefs.h @@ -0,0 +1,39 @@ +/** + * @file XML_Typedefs.h + * @author William R. Otte <wotte@dre.vanderbilt.edu> + * $Id$ + * Typedefs from the XML Utilities. + */ +#ifndef XML_TYPEDEFS_H +#define XML_TYPEDEFS_H + +#include "XML/XML_Helper.h" +#include "XML/XML_Schema_Resolver.h" +#include "XML/XML_Error_Handler.h" + +#include "SA_Builder_Export.h" + +namespace SA_POP +{ + namespace XML + { + class SA_BUILDER_Export XML_Helper + { + public: + typedef ::CIAO::XML::Environment_Resolver PATH_RESOLVER; + typedef ::CIAO::XML::XML_Schema_Resolver< ::CIAO::XML::Environment_Resolver > XML_RESOLVER; + typedef ::CIAO::XML::XML_Error_Handler ERROR_HANDLER; + typedef ::CIAO::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER; + + static PATH_RESOLVER _path_resolver; + static XML_RESOLVER _xml_resolver; + static ERROR_HANDLER _xml_error_handler; + + public: + static HELPER XML_HELPER; + }; + } +} + + +#endif /* XML_TYPEDEFS_H */ diff --git a/SA_POP/SA_POP_for_RACE.mpc b/SA_POP/SA_POP_for_RACE.mpc index cc35697be41..3045b240014 100644 --- a/SA_POP/SA_POP_for_RACE.mpc +++ b/SA_POP/SA_POP_for_RACE.mpc @@ -1,4 +1,4 @@ -project(SA_POP) : ciao_config_handlers, ciao_deployment_stub, xerces, race_common { +project(SA_POP) : ciao_config_handlers, dance_deployment_stub, xerces, race_common { after += XSC_Config_Handlers sharedname = SA_POP diff --git a/SA_POP/TaskMapFileIn.cpp b/SA_POP/TaskMapFileIn.cpp index 29fbcac3536..d2f83592f46 100644 --- a/SA_POP/TaskMapFileIn.cpp +++ b/SA_POP/TaskMapFileIn.cpp @@ -15,7 +15,7 @@ #include "SA_POP_Types.h" #include "TaskMapFileIn.h" #include "Builder.h" -#include "Utils/XML_Helper.h" +#include "SA_POP_XML_Typedefs.h" #include "XML_TaskMap.hpp" using namespace SA_POP; @@ -32,19 +32,20 @@ TaskMapFileIn::~TaskMapFileIn (void) // Nothing to do. }; +using SA_POP::XML::XML_Helper; + // Build task map from XML file. void TaskMapFileIn::build_task_map (std::string filename, Builder *builder) { - CIAO::Config_Handlers::XML_Helper helper; - if (!helper.is_initialized ()) + if (!XML_Helper::XML_HELPER.is_initialized ()) throw "SA_POP::TaskMapFileIn::build_task_map (): Could not initialize XML_Helper"; // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = #if defined (SA_POP_HAS_CIAO) - helper.create_dom (filename.c_str ()); + XML_Helper::XML_HELPER.create_dom (filename.c_str ()); #else - helper.create_dom (filename.c_str (), ""); + XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); #endif /* SA_POP_HAS_CIAO */ if (!dom) throw "SA_POP::TaskMapFileIn::build_task_map (): Could not create Xerces DOMDocument from file"; diff --git a/SA_POP/Tester/Tester_Component.mpc b/SA_POP/Tester/Tester_Component.mpc index 691137978bf..b075cb1fcde 100644 --- a/SA_POP/Tester/Tester_Component.mpc +++ b/SA_POP/Tester/Tester_Component.mpc @@ -1,6 +1,6 @@ // $Id$ -project(Tester_Component_stub): ciao_client_dnc, ciao_deployment_stub, race_idl { +project(Tester_Component_stub): ccm_stub, dance_deployment_stub, race_idl { sharedname = Tester_Component_stub @@ -31,7 +31,7 @@ project(Tester_Component_stub): ciao_client_dnc, ciao_deployment_stub, race_idl } } -project(Tester_Component_svnt) : ciao_servant_dnc, race_idl { +project(Tester_Component_svnt) : ciao_servant, race_idl { after += Tester_Component_stub sharedname = Tester_Component_svnt libs += Tester_Component_stub \ @@ -68,7 +68,7 @@ project(Tester_Component_svnt) : ciao_servant_dnc, race_idl { } } -project(Tester_Component_exec) : ciao_component_dnc, race_common { +project(Tester_Component_exec) : ciao_executor, race_common { after += Tester_Component_svnt sharedname = Tester_Component_exec @@ -93,7 +93,7 @@ project(Tester_Component_exec) : ciao_component_dnc, race_common { } -project (Tester_Client) : ciao_client_dnc, valuetype, ciao_deployment_stub, race_common { +project (Tester_Client) : ccm_stub, valuetype, dance_deployment_stub, race_common { avoids += ace_for_tao exename = tester_client after += Tester_Component_stub diff --git a/SA_POP/Tester/Tester_Component_exec.cpp b/SA_POP/Tester/Tester_Component_exec.cpp index 25df66e0497..7209120a94f 100644 --- a/SA_POP/Tester/Tester_Component_exec.cpp +++ b/SA_POP/Tester/Tester_Component_exec.cpp @@ -134,7 +134,7 @@ namespace CIAO } void - Tester_Component_exec_i::ciao_postactivate () + Tester_Component_exec_i::configuration_complete () { // Your code here. } diff --git a/SA_POP/Tester/Tester_Component_exec.h b/SA_POP/Tester/Tester_Component_exec.h index 350f5a3791a..ab8e28d7e2f 100644 --- a/SA_POP/Tester/Tester_Component_exec.h +++ b/SA_POP/Tester/Tester_Component_exec.h @@ -81,7 +81,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/SA_POP/examples/Space/source/Analysis/Analysis_Component.mpc b/SA_POP/examples/Space/source/Analysis/Analysis_Component.mpc index d2e980d0a60..b576f61ff5d 100644 --- a/SA_POP/examples/Space/source/Analysis/Analysis_Component.mpc +++ b/SA_POP/examples/Space/source/Analysis/Analysis_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Analysis_Component" -project(Analysis_Component_stub): ciao_client_dnc, race_idl { +project(Analysis_Component_stub): ccm_stub, race_idl { sharedname = Analysis_Component_stub after += Event_Types_stub @@ -23,7 +23,7 @@ project(Analysis_Component_stub): ciao_client_dnc, race_idl { } } -project(Analysis_Component_svnt) : ciao_servant_dnc, race_idl { +project(Analysis_Component_svnt) : ciao_servant, race_idl { after += Analysis_Component_stub sharedname = Analysis_Component_svnt includes += ../common @@ -53,7 +53,7 @@ project(Analysis_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Analysis_Component_exec) : ciao_component_dnc, race_common { +project(Analysis_Component_exec) : ciao_executor, race_common { after += Analysis_Component_svnt includes += ../common sharedname = Analysis_Component_exec diff --git a/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.cpp b/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.cpp index d2cb29f17be..74cd10668fb 100644 --- a/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.cpp @@ -64,7 +64,7 @@ namespace CIDL_Analysis_Component } void - Analysis_Component_exec_i::ciao_postactivate ( + Analysis_Component_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.h b/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.h index a7c12423c00..9eacd2d810c 100644 --- a/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.h +++ b/SA_POP/examples/Space/source/Analysis/Analysis_Component_exec.h @@ -72,7 +72,7 @@ namespace CIDL_Analysis_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.mpc b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.mpc index c06e17562d4..867e90a5eef 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.mpc +++ b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High.mpc @@ -1,4 +1,4 @@ -project(Backup_Gizmo_High_stub): ciao_client_dnc, race_idl { +project(Backup_Gizmo_High_stub): ccm_stub, race_idl { sharedname = Backup_Gizmo_High_stub libs += Event_Types_stub @@ -20,7 +20,7 @@ project(Backup_Gizmo_High_stub): ciao_client_dnc, race_idl { } } -project(Backup_Gizmo_High_svnt) : ciao_servant_dnc, race_idl { +project(Backup_Gizmo_High_svnt) : ciao_servant, race_idl { after += Backup_Gizmo_High_stub includes += ../common sharedname = Backup_Gizmo_High_svnt @@ -51,7 +51,7 @@ project(Backup_Gizmo_High_svnt) : ciao_servant_dnc, race_idl { } -project(Backup_Gizmo_High_exec) : ciao_component_dnc, race_common { +project(Backup_Gizmo_High_exec) : ciao_executor, race_common { after += Backup_Gizmo_High_svnt includes += ../common sharedname = Backup_Gizmo_High_exec diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.cpp b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.cpp index 1ea894df050..5e85a688616 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.cpp +++ b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.cpp @@ -59,7 +59,7 @@ namespace CIDL_Backup_Gizmo_Low } void - Backup_Gizmo_High_exec_i::ciao_postactivate ( + Backup_Gizmo_High_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.h b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.h index e2e9d06367e..85769c0b455 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.h +++ b/SA_POP/examples/Space/source/Backup_Gizmo_High/Backup_Gizmo_High_exec.h @@ -45,7 +45,7 @@ namespace CIDL_Backup_Gizmo_Low ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.mpc b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.mpc index bb46737bd5b..313a3748a4c 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.mpc +++ b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Backup_Gizmo_Low" -project(Backup_Gizmo_Low_stub): ciao_client_dnc, race_idl { +project(Backup_Gizmo_Low_stub): ccm_stub, race_idl { after += Event_Types_stub sharedname = Backup_Gizmo_Low_stub libs += Event_Types_stub @@ -22,7 +22,7 @@ project(Backup_Gizmo_Low_stub): ciao_client_dnc, race_idl { } } -project(Backup_Gizmo_Low_svnt) : ciao_servant_dnc, race_idl { +project(Backup_Gizmo_Low_svnt) : ciao_servant, race_idl { after += Backup_Gizmo_Low_stub includes += ../common sharedname = Backup_Gizmo_Low_svnt @@ -52,7 +52,7 @@ project(Backup_Gizmo_Low_svnt) : ciao_servant_dnc, race_idl { } -project(Backup_Gizmo_Low_exec) : ciao_component_dnc, race_common { +project(Backup_Gizmo_Low_exec) : ciao_executor, race_common { after += Backup_Gizmo_Low_svnt includes += ../common sharedname = Backup_Gizmo_Low_exec diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.cpp b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.cpp index 5c687483b72..8f30e3c7263 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.cpp +++ b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.cpp @@ -60,7 +60,7 @@ namespace CIDL_Backup_Gizmo_Low } void - Backup_Gizmo_Low_exec_i::ciao_postactivate ( + Backup_Gizmo_Low_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.h b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.h index b989c2260b4..20ccd369b57 100644 --- a/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.h +++ b/SA_POP/examples/Space/source/Backup_Gizmo_Low/Backup_Gizmo_Low_exec.h @@ -45,7 +45,7 @@ namespace CIDL_Backup_Gizmo_Low ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Comm/Comm_Component.mpc b/SA_POP/examples/Space/source/Comm/Comm_Component.mpc index cb6bcfd2fc6..92fa20256e4 100644 --- a/SA_POP/examples/Space/source/Comm/Comm_Component.mpc +++ b/SA_POP/examples/Space/source/Comm/Comm_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Comm_Component" -project(Comm_Component_stub): ciao_client_dnc, race_idl { +project(Comm_Component_stub): ccm_stub, race_idl { sharedname = Comm_Component_stub after += Event_Types_stub includes += ../common @@ -22,7 +22,7 @@ project(Comm_Component_stub): ciao_client_dnc, race_idl { } } -project(Comm_Component_svnt) : ciao_servant_dnc, race_idl { +project(Comm_Component_svnt) : ciao_servant, race_idl { after += Comm_Component_stub Event_Types_svnt includes += ../common sharedname = Comm_Component_svnt @@ -52,7 +52,7 @@ project(Comm_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Comm_Component_exec) : ciao_component_dnc, race_common { +project(Comm_Component_exec) : ciao_executor, race_common { after += Comm_Component_svnt includes += ../common sharedname = Comm_Component_exec diff --git a/SA_POP/examples/Space/source/Comm/Comm_Component_exec.cpp b/SA_POP/examples/Space/source/Comm/Comm_Component_exec.cpp index 8fd92874fa6..801edcc4b10 100644 --- a/SA_POP/examples/Space/source/Comm/Comm_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Comm/Comm_Component_exec.cpp @@ -75,7 +75,7 @@ namespace CIDL_Comm_Component } void - Comm_Component_exec_i::ciao_postactivate ( + Comm_Component_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Comm/Comm_Component_exec.h b/SA_POP/examples/Space/source/Comm/Comm_Component_exec.h index 5aeeca9f08c..438359a0d1d 100644 --- a/SA_POP/examples/Space/source/Comm/Comm_Component_exec.h +++ b/SA_POP/examples/Space/source/Comm/Comm_Component_exec.h @@ -78,7 +78,7 @@ namespace CIDL_Comm_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Compression/Compression_Component.mpc b/SA_POP/examples/Space/source/Compression/Compression_Component.mpc index a657a1dd7e8..c46a268eb33 100644 --- a/SA_POP/examples/Space/source/Compression/Compression_Component.mpc +++ b/SA_POP/examples/Space/source/Compression/Compression_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Compression_Component" -project(Compression_Component_stub): ciao_client_dnc, race_idl { +project(Compression_Component_stub): ccm_stub, race_idl { after += Event_Types_stub includes += ../common @@ -23,7 +23,7 @@ project(Compression_Component_stub): ciao_client_dnc, race_idl { } } -project(Compression_Component_svnt) : ciao_servant_dnc, race_idl { +project(Compression_Component_svnt) : ciao_servant, race_idl { after += Compression_Component_stub Event_Types_svnt includes += ../common sharedname = Compression_Component_svnt @@ -53,7 +53,7 @@ project(Compression_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Compression_Component_exec) : ciao_component_dnc, race_common { +project(Compression_Component_exec) : ciao_executor, race_common { after += Compression_Component_svnt sharedname = Compression_Component_exec includes += ../common diff --git a/SA_POP/examples/Space/source/Compression/Compression_Component_exec.cpp b/SA_POP/examples/Space/source/Compression/Compression_Component_exec.cpp index f77db97029c..fb45916a4a2 100644 --- a/SA_POP/examples/Space/source/Compression/Compression_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Compression/Compression_Component_exec.cpp @@ -84,7 +84,7 @@ namespace CIDL_Compression_Component } void - Compression_Component_exec_i::ciao_postactivate ( + Compression_Component_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Compression/Compression_Component_exec.h b/SA_POP/examples/Space/source/Compression/Compression_Component_exec.h index fc4eef7c745..fc38886ebdd 100644 --- a/SA_POP/examples/Space/source/Compression/Compression_Component_exec.h +++ b/SA_POP/examples/Space/source/Compression/Compression_Component_exec.h @@ -72,7 +72,7 @@ namespace CIDL_Compression_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Exec/Exec_Component.mpc b/SA_POP/examples/Space/source/Exec/Exec_Component.mpc index 57e59bdb82a..36db99d3745 100644 --- a/SA_POP/examples/Space/source/Exec/Exec_Component.mpc +++ b/SA_POP/examples/Space/source/Exec/Exec_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Exec_Component" -project(Exec_Component_stub): ciao_client_dnc, race_idl { +project(Exec_Component_stub): ccm_stub, race_idl { after += Event_Types_stub includes += ../common @@ -24,7 +24,7 @@ project(Exec_Component_stub): ciao_client_dnc, race_idl { } } -project(Exec_Component_svnt) : ciao_servant_dnc, race_idl { +project(Exec_Component_svnt) : ciao_servant, race_idl { after += Exec_Component_stub Event_Types_svnt sharedname = Exec_Component_svnt libs += Exec_Component_stub Event_Types_stub Event_Types_svnt @@ -54,7 +54,7 @@ project(Exec_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Exec_Component_exec) : ciao_component_dnc, race_common { +project(Exec_Component_exec) : ciao_executor, race_common { includes += ../common after += Exec_Component_svnt sharedname = Exec_Component_exec diff --git a/SA_POP/examples/Space/source/Exec/Exec_Component_exec.cpp b/SA_POP/examples/Space/source/Exec/Exec_Component_exec.cpp index 1b90b6e18bd..e1d65e1bea9 100644 --- a/SA_POP/examples/Space/source/Exec/Exec_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Exec/Exec_Component_exec.cpp @@ -69,7 +69,7 @@ namespace CIDL_Exec_Component } void - Exec_Component_exec_i::ciao_postactivate ( + Exec_Component_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Exec/Exec_Component_exec.h b/SA_POP/examples/Space/source/Exec/Exec_Component_exec.h index 08240737be3..06dd4ac1a04 100644 --- a/SA_POP/examples/Space/source/Exec/Exec_Component_exec.h +++ b/SA_POP/examples/Space/source/Exec/Exec_Component_exec.h @@ -43,7 +43,7 @@ namespace CIDL_Exec_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Filter/Filter_Component.mpc b/SA_POP/examples/Space/source/Filter/Filter_Component.mpc index c02331a6b45..2e98e90d480 100644 --- a/SA_POP/examples/Space/source/Filter/Filter_Component.mpc +++ b/SA_POP/examples/Space/source/Filter/Filter_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Filter_Component" -project(Filter_Component_stub): ciao_client_dnc, race_idl { +project(Filter_Component_stub): ccm_stub, race_idl { sharedname = Filter_Component_stub after += Event_Types_stub @@ -23,7 +23,7 @@ project(Filter_Component_stub): ciao_client_dnc, race_idl { } } -project(Filter_Component_svnt) : ciao_servant_dnc, race_idl { +project(Filter_Component_svnt) : ciao_servant, race_idl { after += Filter_Component_stub sharedname = Filter_Component_svnt includes += ../common @@ -53,7 +53,7 @@ project(Filter_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Filter_Component_exec) : ciao_component_dnc, race_common { +project(Filter_Component_exec) : ciao_executor, race_common { after += Filter_Component_svnt includes += ../common sharedname = Filter_Component_exec diff --git a/SA_POP/examples/Space/source/Filter/Filter_Component_exec.cpp b/SA_POP/examples/Space/source/Filter/Filter_Component_exec.cpp index 5c7887bc22b..9af4105df3b 100644 --- a/SA_POP/examples/Space/source/Filter/Filter_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Filter/Filter_Component_exec.cpp @@ -64,7 +64,7 @@ namespace CIDL_Filter_Component } void - Filter_Component_exec_i::ciao_postactivate ( + Filter_Component_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Filter/Filter_Component_exec.h b/SA_POP/examples/Space/source/Filter/Filter_Component_exec.h index ffadff71a1d..14a64c83d70 100644 --- a/SA_POP/examples/Space/source/Filter/Filter_Component_exec.h +++ b/SA_POP/examples/Space/source/Filter/Filter_Component_exec.h @@ -72,7 +72,7 @@ namespace CIDL_Filter_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.mpc b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.mpc index d2d9c55560a..baba4e09bd6 100644 --- a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.mpc +++ b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High.mpc @@ -1,4 +1,4 @@ -project(Gizmo1_High_stub): ciao_client_dnc, race_idl { +project(Gizmo1_High_stub): ccm_stub, race_idl { sharedname = Gizmo1_High_stub libs += Event_Types_stub @@ -21,7 +21,7 @@ project(Gizmo1_High_stub): ciao_client_dnc, race_idl { } } -project(Gizmo1_High_svnt) : ciao_servant_dnc, race_idl { +project(Gizmo1_High_svnt) : ciao_servant, race_idl { after += Gizmo1_High_stub sharedname = Gizmo1_High_svnt libs += Gizmo1_High_stub Event_Types_stub @@ -53,7 +53,7 @@ project(Gizmo1_High_svnt) : ciao_servant_dnc, race_idl { } -project(Gizmo1_High_exec) : ciao_component_dnc, race_common { +project(Gizmo1_High_exec) : ciao_executor, race_common { after += Gizmo1_High_svnt sharedname = Gizmo1_High_exec libs += Gizmo1_High_stub Gizmo1_High_svnt Event_Types_stub diff --git a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.cpp b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.cpp index 35a2a957935..6e4adf6b672 100644 --- a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.cpp +++ b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.cpp @@ -62,7 +62,7 @@ namespace CIDL_Gizmo1_High } void - Gizmo1_High_exec_i::ciao_postactivate ( + Gizmo1_High_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.h b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.h index 01df72ee5c1..cbe770faf04 100644 --- a/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.h +++ b/SA_POP/examples/Space/source/Gizmo1_High/Gizmo1_High_exec.h @@ -43,7 +43,7 @@ namespace CIDL_Gizmo1_High ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.mpc b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.mpc index f7367f9c67e..320aaebfec1 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.mpc +++ b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low.mpc @@ -1,4 +1,4 @@ -project(Gizmo1_Low_stub): ciao_client_dnc, race_idl { +project(Gizmo1_Low_stub): ccm_stub, race_idl { sharedname = Gizmo1_Low_stub libs += Event_Types_stub @@ -21,7 +21,7 @@ project(Gizmo1_Low_stub): ciao_client_dnc, race_idl { } } -project(Gizmo1_Low_svnt) : ciao_servant_dnc, race_idl { +project(Gizmo1_Low_svnt) : ciao_servant, race_idl { after += Gizmo1_Low_stub sharedname = Gizmo1_Low_svnt libs += Gizmo1_Low_stub Event_Types_stub @@ -52,7 +52,7 @@ project(Gizmo1_Low_svnt) : ciao_servant_dnc, race_idl { } -project(Gizmo1_Low_exec) : ciao_component_dnc, race_common { +project(Gizmo1_Low_exec) : ciao_executor, race_common { after += Gizmo1_Low_svnt sharedname = Gizmo1_Low_exec libs += Gizmo1_Low_stub Gizmo1_Low_svnt Event_Types_stub diff --git a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.cpp b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.cpp index 7ff4c118cea..903fc397b10 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.cpp +++ b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.cpp @@ -60,7 +60,7 @@ namespace CIDL_Gizmo1_Low } void - Gizmo1_Low_exec_i::ciao_postactivate ( + Gizmo1_Low_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.h b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.h index e2d352935a2..026584c5898 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.h +++ b/SA_POP/examples/Space/source/Gizmo1_Low/Gizmo1_Low_exec.h @@ -43,7 +43,7 @@ namespace CIDL_Gizmo1_Low ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.mpc b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.mpc index 5c7aedaaf01..933a610659a 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.mpc +++ b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium.mpc @@ -1,4 +1,4 @@ -project(Gizmo1_Medium_stub): ciao_client_dnc, race_idl { +project(Gizmo1_Medium_stub): ccm_stub, race_idl { sharedname = Gizmo1_Medium_stub libs += Event_Types_stub @@ -22,7 +22,7 @@ project(Gizmo1_Medium_stub): ciao_client_dnc, race_idl { } } -project(Gizmo1_Medium_svnt) : ciao_servant_dnc, race_idl { +project(Gizmo1_Medium_svnt) : ciao_servant, race_idl { after += Gizmo1_Medium_stub sharedname = Gizmo1_Medium_svnt libs += Gizmo1_Medium_stub Event_Types_stub @@ -54,7 +54,7 @@ project(Gizmo1_Medium_svnt) : ciao_servant_dnc, race_idl { } -project(Gizmo1_Medium_exec) : ciao_component_dnc, race_common { +project(Gizmo1_Medium_exec) : ciao_executor, race_common { after += Gizmo1_Medium_svnt sharedname = Gizmo1_Medium_exec libs += Gizmo1_Medium_stub Gizmo1_Medium_svnt Event_Types_stub diff --git a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.cpp b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.cpp index 023ea43fcae..b3466282682 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.cpp +++ b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.cpp @@ -61,7 +61,7 @@ namespace CIDL_Gizmo1_Medium } void - Gizmo1_Medium_exec_i::ciao_postactivate ( + Gizmo1_Medium_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.h b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.h index 7c5151ce1e4..5de0c79c27d 100644 --- a/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.h +++ b/SA_POP/examples/Space/source/Gizmo1_Medium/Gizmo1_Medium_exec.h @@ -43,7 +43,7 @@ namespace CIDL_Gizmo1_Medium ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.mpc b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.mpc index 6262d9471e8..68bc6d7334a 100644 --- a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.mpc +++ b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High.mpc @@ -1,4 +1,4 @@ -project(Gizmo2_High_stub): ciao_client_dnc, race_idl { +project(Gizmo2_High_stub): ccm_stub, race_idl { sharedname = Gizmo2_High_stub libs += Event_Types_stub @@ -22,7 +22,7 @@ project(Gizmo2_High_stub): ciao_client_dnc, race_idl { } } -project(Gizmo2_High_svnt) : ciao_servant_dnc, race_idl { +project(Gizmo2_High_svnt) : ciao_servant, race_idl { after += Gizmo2_High_stub sharedname = Gizmo2_High_svnt libs += Gizmo2_High_stub Event_Types_stub @@ -55,7 +55,7 @@ project(Gizmo2_High_svnt) : ciao_servant_dnc, race_idl { } -project(Gizmo2_High_exec) : ciao_component_dnc, race_common { +project(Gizmo2_High_exec) : ciao_executor, race_common { after += Gizmo2_High_svnt sharedname = Gizmo2_High_exec libs += Gizmo2_High_stub Gizmo2_High_svnt Event_Types_stub diff --git a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.cpp b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.cpp index af7c315026f..2d9d849d557 100644 --- a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.cpp +++ b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.cpp @@ -70,7 +70,7 @@ namespace CIDL_Gizmo2_High } void - Gizmo2_High_exec_i::ciao_postactivate ( + Gizmo2_High_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.h b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.h index f3a5a2ec3b5..75e87b79aeb 100644 --- a/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.h +++ b/SA_POP/examples/Space/source/Gizmo2_High/Gizmo2_High_exec.h @@ -43,7 +43,7 @@ namespace CIDL_Gizmo2_High ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.mpc b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.mpc index 952fd47b691..63dbbf88639 100644 --- a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.mpc +++ b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium.mpc @@ -1,4 +1,4 @@ -project(Gizmo2_Medium_stub): ciao_client_dnc, race_idl { +project(Gizmo2_Medium_stub): ccm_stub, race_idl { sharedname = Gizmo2_Medium_stub libs += Event_Types_stub @@ -22,7 +22,7 @@ project(Gizmo2_Medium_stub): ciao_client_dnc, race_idl { } } -project(Gizmo2_Medium_svnt) : ciao_servant_dnc, race_idl { +project(Gizmo2_Medium_svnt) : ciao_servant, race_idl { after += Gizmo2_Medium_stub sharedname = Gizmo2_Medium_svnt libs += Gizmo2_Medium_stub Event_Types_stub @@ -54,7 +54,7 @@ project(Gizmo2_Medium_svnt) : ciao_servant_dnc, race_idl { } -project(Gizmo2_Medium_exec) : ciao_component_dnc, race_common { +project(Gizmo2_Medium_exec) : ciao_executor, race_common { after += Gizmo2_Medium_svnt sharedname = Gizmo2_Medium_exec libs += Gizmo2_Medium_stub Gizmo2_Medium_svnt Event_Types_stub diff --git a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.cpp b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.cpp index 3869acebd0a..4e0e59baaae 100644 --- a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.cpp +++ b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.cpp @@ -63,7 +63,7 @@ namespace CIDL_Gizmo2_Medium } void - Gizmo2_Medium_exec_i::ciao_postactivate ( + Gizmo2_Medium_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.h b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.h index 13b8173d9a9..4032652ad74 100644 --- a/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.h +++ b/SA_POP/examples/Space/source/Gizmo2_Medium/Gizmo2_Medium_exec.h @@ -44,7 +44,7 @@ namespace CIDL_Gizmo2_Medium ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Ground/Ground_Component.mpc b/SA_POP/examples/Space/source/Ground/Ground_Component.mpc index 2dac7ded4b0..23974eefd5e 100644 --- a/SA_POP/examples/Space/source/Ground/Ground_Component.mpc +++ b/SA_POP/examples/Space/source/Ground/Ground_Component.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Ground_Component" -project(Ground_Component_stub): ciao_client_dnc, race_idl { +project(Ground_Component_stub): ccm_stub, race_idl { after += Event_Types_stub includes += ../common @@ -23,7 +23,7 @@ project(Ground_Component_stub): ciao_client_dnc, race_idl { } } -project(Ground_Component_svnt) : ciao_servant_dnc, race_idl { +project(Ground_Component_svnt) : ciao_servant, race_idl { after += Ground_Component_stub Event_Types_svnt sharedname = Ground_Component_svnt libs += Ground_Component_stub Event_Types_stub Event_Types_svnt @@ -53,7 +53,7 @@ project(Ground_Component_svnt) : ciao_servant_dnc, race_idl { } -project(Ground_Component_exec) : ciao_component_dnc, race_common { +project(Ground_Component_exec) : ciao_executor, race_common { includes += ../common after += Ground_Component_svnt sharedname = Ground_Component_exec diff --git a/SA_POP/examples/Space/source/Ground/Ground_Component_exec.cpp b/SA_POP/examples/Space/source/Ground/Ground_Component_exec.cpp index 9c1bdb36ded..35fe90087a5 100644 --- a/SA_POP/examples/Space/source/Ground/Ground_Component_exec.cpp +++ b/SA_POP/examples/Space/source/Ground/Ground_Component_exec.cpp @@ -70,7 +70,7 @@ namespace CIDL_Ground_Component } void - Ground_Station_exec_i::ciao_postactivate ( + Ground_Station_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Ground/Ground_Component_exec.h b/SA_POP/examples/Space/source/Ground/Ground_Component_exec.h index 35719fcb7c4..c56e8ebaaf1 100644 --- a/SA_POP/examples/Space/source/Ground/Ground_Component_exec.h +++ b/SA_POP/examples/Space/source/Ground/Ground_Component_exec.h @@ -72,7 +72,7 @@ namespace CIDL_Ground_Component ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.mpc b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.mpc index 41554039924..d143e8a4672 100644 --- a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.mpc +++ b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Primary_Gizmo" -project(Primary_Gizmo_stub): ciao_client_dnc, race_idl { +project(Primary_Gizmo_stub): ccm_stub, race_idl { after += Event_Types_stub includes += ../common @@ -23,7 +23,7 @@ project(Primary_Gizmo_stub): ciao_client_dnc, race_idl { } } -project(Primary_Gizmo_svnt) : ciao_servant_dnc, race_idl { +project(Primary_Gizmo_svnt) : ciao_servant, race_idl { after += Primary_Gizmo_stub Event_Types_svnt includes += ../common sharedname = Primary_Gizmo_svnt @@ -53,7 +53,7 @@ project(Primary_Gizmo_svnt) : ciao_servant_dnc, race_idl { } -project(Primary_Gizmo_exec) : ciao_component_dnc, race_idl { +project(Primary_Gizmo_exec) : ciao_executor, race_idl { after += Primary_Gizmo_svnt includes += ../common sharedname = Primary_Gizmo_exec diff --git a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.cpp b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.cpp index 90e0e30aca2..780af2fa574 100644 --- a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.cpp +++ b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.cpp @@ -60,7 +60,7 @@ namespace CIDL_Primary_Gizmo } void - Primary_Gizmo_exec_i::ciao_postactivate ( + Primary_Gizmo_exec_i::configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( ::CORBA::SystemException, ::Components::CCMException)) diff --git a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.h b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.h index e0e6430797f..4046dca370c 100644 --- a/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.h +++ b/SA_POP/examples/Space/source/Primary_Gizmo/Primary_Gizmo_exec.h @@ -44,7 +44,7 @@ namespace CIDL_Primary_Gizmo ::Components::CCMException)); virtual void - ciao_postactivate ( + configuration_complete ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( ::CORBA::SystemException, diff --git a/SA_POP/examples/Space/source/common/Event_Types.mpc b/SA_POP/examples/Space/source/common/Event_Types.mpc index 7410ada1d27..4751fe4b708 100644 --- a/SA_POP/examples/Space/source/common/Event_Types.mpc +++ b/SA_POP/examples/Space/source/common/Event_Types.mpc @@ -1,4 +1,4 @@ -project(Event_Types_stub): ciao_client_dnc, race_idl { +project(Event_Types_stub): ccm_stub, race_idl { sharedname = Event_Types_stub idlflags += -Wb,stub_export_macro=EVENT_TYPES_STUB_Export \ @@ -16,7 +16,7 @@ project(Event_Types_stub): ciao_client_dnc, race_idl { } } -project(Event_Types_svnt) : ciao_servant_dnc, race_common { +project(Event_Types_svnt) : ciao_servant, race_common { after += Event_Types_stub sharedname = Event_Types_svnt libs += Event_Types_stub diff --git a/SA_POP/server/Driver.mpc b/SA_POP/server/Driver.mpc index 452bb20496f..3330c9aec33 100644 --- a/SA_POP/server/Driver.mpc +++ b/SA_POP/server/Driver.mpc @@ -1,4 +1,4 @@ -project(Driver_stub): ciao_client_dnc, race_idl { +project(Driver_stub): ccm_stub, race_idl { sharedname = Driver_stub idlflags += -Wb,stub_export_macro=DRIVER_STUB_Export \ -Wb,stub_export_include=Driver_stub_export.h \ @@ -18,7 +18,7 @@ project(Driver_stub): ciao_client_dnc, race_idl { } } -project(Driver_svnt) : ciao_servant_dnc, race_common { +project(Driver_svnt) : ciao_servant, race_common { after += Driver_stub sharedname = Driver_svnt libs += Driver_stub \ @@ -33,7 +33,7 @@ project(Driver_svnt) : ciao_servant_dnc, race_common { } } -project(Server): ciao_component_dnc, ciao_config_handlers, ciao_plan_generator, race_common { +project(Server): ciao_executor, ciao_config_handlers, ciao_plan_generator, race_common { exename = server @@ -64,7 +64,7 @@ project(Server): ciao_component_dnc, ciao_config_handlers, ciao_plan_generator, } } -project(client): taoclient, ciao_component_dnc, ciao_plan_generator, race_common { +project(client): taoclient, ciao_executor, ciao_plan_generator, race_common { exename = client after += Driver_stub SA_POP diff --git a/TM_Daemon/TM_Daemon.mpc b/TM_Daemon/TM_Daemon.mpc index 0ba2b9fd34f..9f89fa51a0a 100644 --- a/TM_Daemon/TM_Daemon.mpc +++ b/TM_Daemon/TM_Daemon.mpc @@ -1,4 +1,4 @@ -project(TM_Daemon_stub): ciao_deployment_stub { +project(TM_Daemon_stub): dance_deployment_stub { sharedname = TM_Daemon_stub dynamicflags = TM_DAEMON_STUB_BUILD_DLL diff --git a/TM_Proxy/ResourceManager.cpp b/TM_Proxy/ResourceManager.cpp index 56912dfb7a2..34aedaf5a49 100644 --- a/TM_Proxy/ResourceManager.cpp +++ b/TM_Proxy/ResourceManager.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "ResourceManager.h" namespace CIAO diff --git a/TM_Proxy/ResourceManager.h b/TM_Proxy/ResourceManager.h index 7ee4bb5dc74..c9c94187135 100644 --- a/TM_Proxy/ResourceManager.h +++ b/TM_Proxy/ResourceManager.h @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #ifndef RESOURCEMANAGER_H #define RESOURCEMANAGER_H diff --git a/TM_Proxy/TM_Proxy.idl b/TM_Proxy/TM_Proxy.idl index 57dbeac8b89..f4cc44f9846 100644 --- a/TM_Proxy/TM_Proxy.idl +++ b/TM_Proxy/TM_Proxy.idl @@ -10,7 +10,7 @@ #ifndef TM_PROXY_IDL #define TM_PROXY_IDL -#include "ciao/Components.idl" +#include "Components.idl" #include "DAnCE/Deployment/Deployment_TargetData.idl" module CIAO { diff --git a/TM_Proxy/TM_Proxy.mpc b/TM_Proxy/TM_Proxy.mpc index e833220766c..bc515a7349f 100644 --- a/TM_Proxy/TM_Proxy.mpc +++ b/TM_Proxy/TM_Proxy.mpc @@ -1,5 +1,5 @@ // $Id$ -project(TM_Proxy_stub) : ciao_client_dnc, ciao_deployment_stub, race_idl { +project(TM_Proxy_stub) : ccm_stub, dance_deployment_stub, race_idl { sharedname = TM_Proxy_Component_stub dynamicflags = TM_PROXY_STUB_BUILD_DLL @@ -28,7 +28,7 @@ project(TM_Proxy_stub) : ciao_client_dnc, ciao_deployment_stub, race_idl { } } -project(TM_Proxy_svnt) : ciao_servant_dnc, race_idl { +project(TM_Proxy_svnt) : ciao_servant, race_idl { after += TM_Proxy_stub sharedname = TM_Proxy_Component_svnt libs += TM_Proxy_Component_stub @@ -67,7 +67,7 @@ project(TM_Proxy_svnt) : ciao_servant_dnc, race_idl { } } -project(TM_Proxy_exec) : ciao_component_dnc, race_common { +project(TM_Proxy_exec) : ciao_executor, race_common, naming { after += TM_Proxy_svnt \ TM_Daemon_stub diff --git a/TM_Proxy/TM_Proxy_exec.cpp b/TM_Proxy/TM_Proxy_exec.cpp index dc89eafe147..3c539f89975 100644 --- a/TM_Proxy/TM_Proxy_exec.cpp +++ b/TM_Proxy/TM_Proxy_exec.cpp @@ -7,6 +7,7 @@ #include "Utility.h" #include "SystemSnapshot.h" +#include "ciao/Containers/Container_Base.h" namespace CIAO { @@ -82,16 +83,16 @@ namespace CIAO } void - TM_Proxy_Component_exec_i::ciao_postactivate () + TM_Proxy_Component_exec_i::configuration_complete () { std::stringstream msg; msg << "TM_Proxy_Component_exec_i::" - "ciao_postactivate (): Trying to obtain " + "configuration_complete (): Trying to obtain " "the object reference of the TM\n"; try { ::CORBA::ORB_ptr orb = - this->context_->_ciao_the_Container()->the_ORB(); + dynamic_cast<CIAO::Container_i *> (this->context_->_ciao_the_Container())->the_ORB(); /// Trying to get the object reference from the Naming Service. CORBA::Object_var naming_obj = diff --git a/TM_Proxy/TM_Proxy_exec.h b/TM_Proxy/TM_Proxy_exec.h index 776072a0e37..d393f21ebc2 100644 --- a/TM_Proxy/TM_Proxy_exec.h +++ b/TM_Proxy/TM_Proxy_exec.h @@ -65,7 +65,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/Tester/tester.mpc b/Tester/tester.mpc index 259b0490d37..92f99cef2e1 100644 --- a/Tester/tester.mpc +++ b/Tester/tester.mpc @@ -1,4 +1,4 @@ -project (Interactive_IA_Tester) : ciao_client_dnc, valuetype, ciao_deployment_stub, race_common { +project (Interactive_IA_Tester) : ccm_stub, valuetype, dance_deployment_stub, race_common { avoids += ace_for_tao exename = Interactive_IA_Tester after += Interactive_Input_Adapter_stub Input_Adapter_Base_stub diff --git a/common/RACE_common.mpc b/common/RACE_common.mpc index a6a37710809..b39d3338cee 100644 --- a/common/RACE_common.mpc +++ b/common/RACE_common.mpc @@ -24,7 +24,7 @@ project(RACE_common_stub): anytypecode, race_idl { } } -project(OpString_stub): ciao_deployment_stub, race_idl { +project(OpString_stub): dance_deployment_stub, race_idl { after += RACE_common_stub sharedname = OpString_stub diff --git a/examples/E2E_Task/Base/Event_Types.mpc b/examples/E2E_Task/Base/Event_Types.mpc index e0d01df8056..44788623f1c 100644 --- a/examples/E2E_Task/Base/Event_Types.mpc +++ b/examples/E2E_Task/Base/Event_Types.mpc @@ -1,4 +1,4 @@ -project(Event_Types_stub): ciao_client_dnc, race_idl { +project(Event_Types_stub): ccm_stub, race_idl { sharedname = Event_Types_stub idlflags += -Wb,stub_export_macro=EVENT_TYPES_STUB_Export \ @@ -16,7 +16,7 @@ project(Event_Types_stub): ciao_client_dnc, race_idl { } } -project(Event_Types_svnt) : ciao_servant_dnc, race_common { +project(Event_Types_svnt) : ciao_servant, race_common { after += Event_Types_stub sharedname = Event_Types_svnt libs += Event_Types_stub diff --git a/examples/E2E_Task/Subtask/Subtask.mpc b/examples/E2E_Task/Subtask/Subtask.mpc index b3686c07a1e..e8c91a445b3 100644 --- a/examples/E2E_Task/Subtask/Subtask.mpc +++ b/examples/E2E_Task/Subtask/Subtask.mpc @@ -31,7 +31,7 @@ project(Subtask_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl { } } -project(Subtask_stub) : ciao_client_dnc, race_common { +project(Subtask_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Subtask_idl_gen \ Event_Types_stub @@ -59,7 +59,7 @@ project(Subtask_stub) : ciao_client_dnc, race_common { } } -project(Subtask_exec) : ciao_component_dnc, race_common { +project(Subtask_exec) : ciao_executor, race_common { avoids += ace_for_tao after += Subtask_cidl_gen \ Subtask_stub \ @@ -95,7 +95,7 @@ project(Subtask_exec) : ciao_component_dnc, race_common { } -project(Subtask_svnt) : ciao_servant_dnc, race_common { +project(Subtask_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Subtask_exec \ Event_Types_svnt diff --git a/examples/E2E_Task/Subtask/Subtask_exec.cpp b/examples/E2E_Task/Subtask/Subtask_exec.cpp index 3a05c56b237..22ce740cd6a 100644 --- a/examples/E2E_Task/Subtask/Subtask_exec.cpp +++ b/examples/E2E_Task/Subtask/Subtask_exec.cpp @@ -90,7 +90,7 @@ namespace CIAO } void - Subtask_exec_i::ciao_postactivate () + Subtask_exec_i::configuration_complete () { // Your code here. } diff --git a/examples/E2E_Task/Subtask/Subtask_exec.h b/examples/E2E_Task/Subtask/Subtask_exec.h index 0507dd2fa96..66014e11a56 100644 --- a/examples/E2E_Task/Subtask/Subtask_exec.h +++ b/examples/E2E_Task/Subtask/Subtask_exec.h @@ -44,7 +44,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/examples/E2E_Task/Trigger/Trigger.mpc b/examples/E2E_Task/Trigger/Trigger.mpc index 112eb26dff6..5a243eceaa5 100644 --- a/examples/E2E_Task/Trigger/Trigger.mpc +++ b/examples/E2E_Task/Trigger/Trigger.mpc @@ -34,7 +34,7 @@ project(Trigger_cidl_gen) : ciaocidldefaults, taoidldefaults, race_idl { } } -project(Trigger_stub) : ciao_client_dnc, race_common { +project(Trigger_stub) : ccm_stub, race_common { avoids += ace_for_tao after += Trigger_idl_gen \ Event_Types_stub @@ -64,7 +64,7 @@ project(Trigger_stub) : ciao_client_dnc, race_common { } } -project(Trigger_exec) : ciao_component_dnc, race_common { +project(Trigger_exec) : ciao_executor, race_common { avoids += ace_for_tao after += Trigger_cidl_gen \ Trigger_stub \ @@ -101,7 +101,7 @@ project(Trigger_exec) : ciao_component_dnc, race_common { } -project(Trigger_svnt) : ciao_servant_dnc, race_common { +project(Trigger_svnt) : ciao_servant, race_common { avoids += ace_for_tao after += Trigger_exec \ Event_Types_svnt diff --git a/examples/E2E_Task/Trigger/Trigger_exec.cpp b/examples/E2E_Task/Trigger/Trigger_exec.cpp index 30277a19642..07e828785c8 100644 --- a/examples/E2E_Task/Trigger/Trigger_exec.cpp +++ b/examples/E2E_Task/Trigger/Trigger_exec.cpp @@ -248,7 +248,7 @@ namespace CIAO } void - Trigger_exec_i::ciao_postactivate () + Trigger_exec_i::configuration_complete () { // Now start the active object. if (this->activate () != 0) diff --git a/examples/E2E_Task/Trigger/Trigger_exec.h b/examples/E2E_Task/Trigger/Trigger_exec.h index d36e7bed6ed..b76d49903d1 100644 --- a/examples/E2E_Task/Trigger/Trigger_exec.h +++ b/examples/E2E_Task/Trigger/Trigger_exec.h @@ -62,7 +62,7 @@ namespace CIAO virtual void ciao_preactivate (); - virtual void ciao_postactivate (); + virtual void configuration_complete (); virtual void ccm_activate (); diff --git a/examples/E2E_Task/Workload/Workload.mpc b/examples/E2E_Task/Workload/Workload.mpc index f5fa37ae33b..e6abd48e24d 100644 --- a/examples/E2E_Task/Workload/Workload.mpc +++ b/examples/E2E_Task/Workload/Workload.mpc @@ -1,4 +1,4 @@ -project(Workload): taoexe, ciao_servant_dnc, race_common { +project(Workload): taoexe, ciao_servant, race_common { exename = Workload after += Trigger_stub diff --git a/utils/RACE_utils.cpp b/utils/RACE_utils.cpp index 595f3914c39..bbb2ea5e938 100644 --- a/utils/RACE_utils.cpp +++ b/utils/RACE_utils.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "RACE_utils.h" #include "ace/Env_Value_T.h" |