diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:28:28 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:28:28 +0000 |
| commit | 5c939196d9713206fdeb05795c57caf84dba3f03 (patch) | |
| tree | 0087d49dc10cf55b27d42d6439e3bf19bfd67a57 /DAnCE | |
| parent | 3018889b98ea7eadc1869f79bf7b3e546294b5d1 (diff) | |
| download | ATCD-5c939196d9713206fdeb05795c57caf84dba3f03.tar.gz | |
Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
*:
Zapped trailing whitespaces using
find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
Diffstat (limited to 'DAnCE')
49 files changed, 311 insertions, 311 deletions
diff --git a/DAnCE/Config_Handlers/Common.h b/DAnCE/Config_Handlers/Common.h index 212a2cc4753..ce359aeb81e 100644 --- a/DAnCE/Config_Handlers/Common.h +++ b/DAnCE/Config_Handlers/Common.h @@ -25,7 +25,7 @@ namespace DAnCE name_ (name), error_ (error) {}; - + void add_name (const std::basic_string<ACE_TCHAR> &name) { name_ = name + ACE_TEXT (":") + name_; diff --git a/DAnCE/Config_Handlers/DD_Handler.h b/DAnCE/Config_Handlers/DD_Handler.h index 8b6ee9c8d00..d234531d749 100644 --- a/DAnCE/Config_Handlers/DD_Handler.h +++ b/DAnCE/Config_Handlers/DD_Handler.h @@ -96,7 +96,7 @@ auto_ptr < ::Deployment::Domain > idl_domain_; /// The XSC Domain structure auto_ptr <Domain> domain_ptr_; - + Domain &domain_; /// The return value used bool retval_; diff --git a/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h b/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h index 231e82e566f..23705477f4b 100644 --- a/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h +++ b/DAnCE/Config_Handlers/DynAny_Handler/DynAlias_Handler.h @@ -39,7 +39,7 @@ namespace DAnCE CORBA::TypeCode_ptr = 0); static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn); - + static CORBA::TypeCode_ptr create_typecode (const DataType &type); }; diff --git a/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h b/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h index bc2254a9bf2..0c6ae41eaeb 100644 --- a/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h +++ b/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.h @@ -53,18 +53,18 @@ namespace DAnCE DynamicAny::DynAny_ptr extract_into_dynany (const DataType &type, const DataValue &value, CORBA::TypeCode_ptr = 0); - + Any extract_from_dynany (const CORBA::Any &any); CORBA::ORB_ptr orb (); DynamicAny::DynAnyFactory_ptr daf (); - + CORBA::TypeCode_ptr create_typecode (const DataType &type); - + void register_typecode (const std::basic_string<ACE_TCHAR> typeID, CORBA::TypeCode_ptr tc); - + CORBA::TypeCode_ptr get_typecode (const std::basic_string<ACE_TCHAR> typeID); private: @@ -72,7 +72,7 @@ namespace DAnCE CORBA::ORB_var orb_; DynamicAny::DynAnyFactory_var daf_; - + std::map <std::basic_string<ACE_TCHAR>, CORBA::TypeCode_ptr> typecode_map_; }; diff --git a/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h index 31d1aee8f01..bf26eabd4f7 100644 --- a/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h +++ b/DAnCE/Config_Handlers/DynAny_Handler/DynEnum_Handler.h @@ -39,7 +39,7 @@ namespace DAnCE CORBA::TypeCode_ptr = 0); static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn); - + static CORBA::TypeCode_ptr create_typecode (const DataType &type); }; diff --git a/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h b/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h index b371fa82fca..8f0716702bf 100644 --- a/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h +++ b/DAnCE/Config_Handlers/DynAny_Handler/DynSequence_Handler.h @@ -39,7 +39,7 @@ namespace DAnCE CORBA::TypeCode_ptr = 0); static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn); - + static CORBA::TypeCode_ptr create_typecode (const DataType &type); }; diff --git a/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h b/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h index 7bfdcd6079f..4c478e094b0 100644 --- a/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h +++ b/DAnCE/Config_Handlers/DynAny_Handler/DynStruct_Handler.h @@ -39,7 +39,7 @@ namespace DAnCE CORBA::TypeCode_ptr = 0); static void extract_out_of_dynany (const DynamicAny::DynAny_ptr dyn); - + static CORBA::TypeCode_ptr create_typecode (const DataType &type); }; diff --git a/DAnCE/Config_Handlers/PL_Handler.h b/DAnCE/Config_Handlers/PL_Handler.h index 40667291afb..83e642573b8 100644 --- a/DAnCE/Config_Handlers/PL_Handler.h +++ b/DAnCE/Config_Handlers/PL_Handler.h @@ -38,15 +38,15 @@ namespace DAnCE public: static void get_PlanLocality (const PlanLocality &desc, Deployment::PlanLocality &toconfig); - + static PlanLocality plan_locality (const ::Deployment::PlanLocality &src); }; - + typedef Sequence_Handler < PlanLocality, ::Deployment::PlanLocalities, ::Deployment::PlanLocality, PL_Handler::get_PlanLocality > PL_Functor; - + } } diff --git a/DAnCE/Config_Handlers/STD_CPD_Handler.h b/DAnCE/Config_Handlers/STD_CPD_Handler.h index 8f8ecc424bc..ba2ba1e06c8 100644 --- a/DAnCE/Config_Handlers/STD_CPD_Handler.h +++ b/DAnCE/Config_Handlers/STD_CPD_Handler.h @@ -68,7 +68,7 @@ namespace DAnCE :xml_helper_ (0) { } - + XML_Helper *xml_helper_; }; } diff --git a/DAnCE/Config_Handlers/XML_File_Intf.h b/DAnCE/Config_Handlers/XML_File_Intf.h index 4964d0544b6..e8762acaf42 100644 --- a/DAnCE/Config_Handlers/XML_File_Intf.h +++ b/DAnCE/Config_Handlers/XML_File_Intf.h @@ -49,7 +49,7 @@ namespace DAnCE const ACE_TCHAR *relpath); protected: - + bool read_process_plan (const ACE_TCHAR *file); bool read_process_domain (const ACE_TCHAR *file); diff --git a/DAnCE/Config_Handlers/XML_Typedefs.h b/DAnCE/Config_Handlers/XML_Typedefs.h index 3012f4758ac..e9c59f3d204 100644 --- a/DAnCE/Config_Handlers/XML_Typedefs.h +++ b/DAnCE/Config_Handlers/XML_Typedefs.h @@ -23,9 +23,9 @@ namespace DAnCE typedef ::DAnCE::XML::XML_Schema_Resolver< ::DAnCE::XML::Environment_Resolver > XML_RESOLVER; typedef ::DAnCE::XML::XML_Error_Handler ERROR_HANDLER; typedef ::DAnCE::XML::XML_Helper< XML_RESOLVER, ERROR_HANDLER > HELPER; - + static ERROR_HANDLER _xml_error_handler; - + public: static HELPER XML_HELPER; }; diff --git a/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h b/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h index 962892ebf14..4737769e2a5 100644 --- a/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h +++ b/DAnCE/DAnCE/DAnCE_DeploymentInterceptors_Base_Impl.h @@ -4,10 +4,10 @@ /** * @file DAnCE_DeploymentInterceptors_Base_Impl.h * - * Base, no-op interceptor. + * Base, no-op interceptor. **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1571 #ifndef DANCE_DEPLOYMENTINTERCEPTORSI_DHYD9F_H_ @@ -25,29 +25,29 @@ namespace DAnCE { /** * @class DAnCE_DeploymentInterceptor_Base - * @brief Base, no-op interceptor implementation. + * @brief Base, no-op interceptor implementation. */ class DANCE_STUB_Export DeploymentInterceptor_Base : public virtual DAnCE::DeploymentInterceptor, public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor DeploymentInterceptor_Base (void); - - // Destructor + + // Destructor virtual ~DeploymentInterceptor_Base (void); - + virtual void configure (const ::Deployment::Properties & config); - + virtual void preprocess_plan (::Deployment::DeploymentPlan & plan); - + virtual void pre_install (::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef); - + virtual void post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong index, @@ -59,12 +59,12 @@ namespace DAnCE ::CORBA::ULong connectionRef, const ::CORBA::Any & endpoint_reference, const ::CORBA::Any & exception_thrown); - + virtual void pre_connect (::Deployment::DeploymentPlan & plan, ::CORBA::ULong connection_index, ::CORBA::Any & provided_reference); - + virtual void post_connect (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, @@ -74,22 +74,22 @@ namespace DAnCE void post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void unexpected_event (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, diff --git a/DAnCE/LocalityManager/Configuration/CPU_Affinity.h b/DAnCE/LocalityManager/Configuration/CPU_Affinity.h index 7fdf3198c65..18b480d0d18 100644 --- a/DAnCE/LocalityManager/Configuration/CPU_Affinity.h +++ b/DAnCE/LocalityManager/Configuration/CPU_Affinity.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor CPU_Affinity (void); - - // Destructor + + // Destructor virtual ~CPU_Affinity (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Configuration/Process_Name.h b/DAnCE/LocalityManager/Configuration/Process_Name.h index 7b78784b20f..d69fa057a1b 100644 --- a/DAnCE/LocalityManager/Configuration/Process_Name.h +++ b/DAnCE/LocalityManager/Configuration/Process_Name.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Process_Name (void); - - // Destructor + + // Destructor virtual ~Process_Name (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Configuration/Process_Priority.h b/DAnCE/LocalityManager/Configuration/Process_Priority.h index 659670ed2f3..9d62fcd55fd 100644 --- a/DAnCE/LocalityManager/Configuration/Process_Priority.h +++ b/DAnCE/LocalityManager/Configuration/Process_Priority.h @@ -26,15 +26,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Process_Priority (void); - - // Destructor + + // Destructor virtual ~Process_Priority (void); - + virtual char * type (void); - + virtual void configure (const ::Deployment::Property & prop); }; diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h b/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h index 7b8c62651c8..7b224ff870d 100644 --- a/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h +++ b/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.h @@ -6,7 +6,7 @@ * @author William R. Otte <wotte@dre.vanderbilt.edu> **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1521 #ifndef DANCE_LOCALITYMANAGERI_PDD6RP_H_ @@ -38,75 +38,75 @@ namespace DAnCE : public virtual POA_DAnCE::LocalityManager { public: - // Constructor + // Constructor LocalityManager_i (const ACE_TString &uuid, std::list <std::string> plugin_config_files, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - + void init (Deployment::Properties *prop); - // Destructor + // Destructor virtual ~LocalityManager_i (void); - + virtual ::Deployment::Properties * configuration (void); - + virtual ::Deployment::ApplicationManager_ptr preparePlan ( const ::Deployment::DeploymentPlan & plan, ::Deployment::ResourceCommitmentManager_ptr resourceCommitment); - + virtual void destroyManager (::Deployment::ApplicationManager_ptr manager); - + virtual void shutdown (void); - + virtual void finishLaunch (const ::Deployment::Connections & providedReference, ::CORBA::Boolean start); - + virtual void start (void); - + virtual ::Deployment::Application_ptr startLaunch (const ::Deployment::Properties & configProperty, ::Deployment::Connections_out providedReference); - + virtual void destroyApplication (::Deployment::Application_ptr app); - + private: void install_instances (const ::Deployment::Properties &prop); - + void collect_references (::Deployment::Connections_out &providedReference); - + ACE_TString uuid_; - + std::list< std::string > plugin_config_files_; CORBA::ORB_var orb_; PortableServer::POA_var poa_; - + typedef std::list< CORBA::ULong > INSTANCE_LIST; - typedef std::map <std::string, + typedef std::map <std::string, INSTANCE_LIST> HANDLER_TABLE; - + HANDLER_TABLE instance_handlers_; - + Plugin_Manager::INSTALL_ORDER handler_order_; - + typedef std::map < std::string, CORBA::Any_var > REFERENCE_MAP; - + REFERENCE_MAP instance_references_; - + ::Deployment::DeploymentPlan plan_; - + ::Deployment::Properties_var props_; - + DAnCE::Deployment_Scheduler scheduler_; - + CORBA::ULong spawn_delay_; }; diff --git a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h index 4487d0b000f..7b9d733910f 100644 --- a/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h +++ b/DAnCE/LocalityManager/Daemon/Locality_Manager_Task.h @@ -43,7 +43,7 @@ namespace DAnCE ACE_TString uuid_; ACE_TString callback_ior_str_; ACE_TString output_file_; - + std::list < std::string > plugin_config_; }; } diff --git a/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h index 40ef22087f3..724768dc131 100644 --- a/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Config_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Config_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_CONFIG_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Config_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Config_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Config_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h index a169d4ec963..6878514602f 100644 --- a/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Inst_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Inst_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_INST_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Inst_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Inst_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Inst_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h index 154e2d72f7d..4e30581c842 100644 --- a/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Interceptor_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Interceptor_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_INTERCEPTOR_HANDLER_H @@ -28,15 +28,15 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Interceptor_Handler_Impl (void); - - // Destructor + + // Destructor virtual ~Interceptor_Handler_Impl (void); - + virtual char * instance_type (void); - + ::CORBA::StringSeq * dependencies (void); @@ -44,7 +44,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -59,29 +59,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; }; @@ -89,7 +89,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Interceptor_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h index 82dbf6a230c..91b65a5fc93 100644 --- a/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h +++ b/DAnCE/LocalityManager/Handler/LocalityActivator_Impl.h @@ -99,7 +99,7 @@ namespace DAnCE void create_properties (const Server_Info &info, Deployment::Properties_out config); - + struct Server_Info { enum ProcessStatus diff --git a/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h b/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h index 5d61094176a..576b2ed5cfe 100644 --- a/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h +++ b/DAnCE/LocalityManager/Handler/Locality_Manager_Handler_Impl.h @@ -4,8 +4,8 @@ /** * @file Locality_Manager_Handler_Impl.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Installation handler implementation for spawning LocalityManagers. + * + * Installation handler implementation for spawning LocalityManagers. */ #ifndef DANCE_LOCALITYMANAGERI_MIGAYG_H_ @@ -30,12 +30,12 @@ namespace DAnCE public virtual ::CORBA::LocalObject { public: - // Constructor + // Constructor Locality_Handler_i (void); - - // Destructor + + // Destructor virtual ~Locality_Handler_i (void); - + virtual char * instance_type (void); @@ -46,7 +46,7 @@ namespace DAnCE void install_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, ::CORBA::Any_out instance_reference); - + virtual void activate_instance (const ::Deployment::DeploymentPlan & , ::CORBA::ULong , @@ -61,29 +61,29 @@ namespace DAnCE ::CORBA::ULong instanceRef, const ::CORBA::Any & instance_reference); - virtual + virtual void provide_endpoint_reference (const ::Deployment::DeploymentPlan &, ::CORBA::ULong, ::CORBA::Any_out) {}; - + virtual void connect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, const ::CORBA::Any & provided_reference); - + virtual void disconnect_instance (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef); - virtual + virtual void instance_configured (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong) {}; + ::CORBA::ULong) {}; virtual void configure(const Deployment::Properties&); - + virtual void close (void); - + private: static const char *instance_type_; DAnCE_LocalityActivator_i *activator_; @@ -92,7 +92,7 @@ namespace DAnCE extern "C" { - ::DAnCE::InstanceDeploymentHandler_ptr + ::DAnCE::InstanceDeploymentHandler_ptr DAnCE_Locality_Handler_Export create_Locality_Handler (void); } diff --git a/DAnCE/LocalityManager/Handler/Plugin_Conf.h b/DAnCE/LocalityManager/Handler/Plugin_Conf.h index 4c32b74bb57..8aba027cd6f 100644 --- a/DAnCE/LocalityManager/Handler/Plugin_Conf.h +++ b/DAnCE/LocalityManager/Handler/Plugin_Conf.h @@ -18,15 +18,15 @@ namespace DAnCE { public: void load_from_text_file (const ACE_TCHAR *file); - + private: void deploy_plan (::Deployment::DeploymentPlan &plan); - + void create_entry (const char *artifact, const char *entrypoint, const char *type, ::Deployment::DeploymentPlan &plan, - CORBA::ULong pos); + CORBA::ULong pos); }; } #endif diff --git a/DAnCE/LocalityManager/Interceptors/Best_Effort.h b/DAnCE/LocalityManager/Interceptors/Best_Effort.h index 5d08dad0b3c..9cdfadbbbfc 100644 --- a/DAnCE/LocalityManager/Interceptors/Best_Effort.h +++ b/DAnCE/LocalityManager/Interceptors/Best_Effort.h @@ -24,13 +24,13 @@ namespace DAnCE : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor - + // Constructor + Best_Effort (void); - - // Destructor + + // Destructor virtual ~Best_Effort (void); - + virtual void post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong index, @@ -47,31 +47,31 @@ namespace DAnCE void post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); virtual void configure(const Deployment::Properties&); - + private: }; } extern "C" { - ::DAnCE::DeploymentInterceptor_ptr + ::DAnCE::DeploymentInterceptor_ptr DAnCE_Error_Interceptors_Export create_DAnCE_Best_Effort (void); } diff --git a/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h b/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h index ddc5cb9828a..078d59b9394 100644 --- a/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h +++ b/DAnCE/LocalityManager/Scheduler/Dependency_Sorter.h @@ -31,12 +31,12 @@ namespace DAnCE /// Add a dependency to the map. void add_dependency (const std::string &subject, const std::string &install_after); - + void calculate_order (INSTALL_ORDER &); private: typedef std::map < std::string, IH_DEPS > DEP_MAP; - + DEP_MAP dep_map_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h b/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h index 89f960a7679..83f527eb8c5 100644 --- a/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h +++ b/DAnCE/LocalityManager/Scheduler/Deployment_Completion.h @@ -33,19 +33,19 @@ namespace DAnCE virtual ~Deployment_Completion (void); virtual void update (const Event_Future &future); - + void accept (Event_Future &future); /// Waits for completion of all events, with a timeout bool wait_on_completion (ACE_Time_Value *tv); - + void completed_events (Event_List &event_list); protected: virtual void on_all_completed (); virtual void on_all_completed_with_failure (); - + bool single_threaded_wait_on_completion (ACE_Time_Value *tv); private: @@ -53,7 +53,7 @@ namespace DAnCE TAO_SYNCH_MUTEX mutex_; ACE_Condition< TAO_SYNCH_MUTEX > condition_; - + Event_List completed_events_; }; diff --git a/DAnCE/LocalityManager/Scheduler/Deployment_Event.h b/DAnCE/LocalityManager/Scheduler/Deployment_Event.h index 491a0380e8b..80f8b1e6ffb 100644 --- a/DAnCE/LocalityManager/Scheduler/Deployment_Event.h +++ b/DAnCE/LocalityManager/Scheduler/Deployment_Event.h @@ -33,26 +33,26 @@ namespace DAnCE bool exception_; CORBA::Any_var contents_; }; - + typedef ACE_Future< Event_Result > Event_Future; - + typedef std::list <Event_Future> Event_List; - - class Deployment_Scheduler_Export Deployment_Event : + + class Deployment_Scheduler_Export Deployment_Event : public virtual ACE_Method_Request { public: Deployment_Event (Event_Future holder, const char *name, const char *instance_type); - + Event_Future get_future (void); - + protected: Event_Future holder_; std::string name_; std::string instance_type_; - }; + }; } #if defined (__ACE_INLINE__) diff --git a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h index 2df49327dab..13963444875 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Action_Base.h @@ -19,23 +19,23 @@ namespace DAnCE Action_Base (Event_Future holder, const char *name, const char *instance_type); - + virtual ~Action_Base (void); - + virtual int call (void); - + protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &) = 0; - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr) = 0; - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &) = 0; - + virtual void create_unexpected_exception (const std::string &, const std::string &) = 0; - + virtual void create_valid_result (Event_Result &) = 0; - + ::CORBA::Any_var instance_excep_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Events/Configured.h b/DAnCE/LocalityManager/Scheduler/Events/Configured.h index 126ced680bf..09f4fb50245 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Configured.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Configured.h @@ -1,7 +1,7 @@ /** * @file Configured.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -26,25 +26,25 @@ namespace DAnCE ::CORBA::ULong instanceRef, const char *instance_type, Event_Future holder); - + virtual ~Instance_Configured (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Connect.h b/DAnCE/LocalityManager/Scheduler/Events/Connect.h index 9be0214f7df..f267f992851 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Connect.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Connect.h @@ -1,7 +1,7 @@ /** * @file Connect.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const ::CORBA::Any &provided_ref, const char *instance_type, Event_Future holder); - + virtual ~Connect_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong connectionRef_; ::CORBA::Any provided_ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h b/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h index 99ed12cd5f8..4f36d90ced9 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Endpoint.h @@ -1,7 +1,7 @@ /** * @file Endpoint.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -26,26 +26,26 @@ namespace DAnCE ::CORBA::ULong connectionRef, const char *instance_type, Event_Future holder); - + virtual ~Endpoint_Reference (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong connectionRef_; ::CORBA::Any_var ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Install.h b/DAnCE/LocalityManager/Scheduler/Events/Install.h index f46ece21ef1..4668ebf07c0 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Install.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Install.h @@ -31,20 +31,20 @@ namespace DAnCE protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; - + ::CORBA::Any_var instance_; }; } diff --git a/DAnCE/LocalityManager/Scheduler/Events/Passivate.h b/DAnCE/LocalityManager/Scheduler/Events/Passivate.h index 4ad3563d7c5..3a1dec91065 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Passivate.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Passivate.h @@ -1,7 +1,7 @@ /** * @file Passivate.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &ref, const char *instance_type, Event_Future holder); - + virtual ~Passivate_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; const ::CORBA::Any &ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Remove.h b/DAnCE/LocalityManager/Scheduler/Events/Remove.h index b0fc368c5e9..0aa8a2ef236 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Remove.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Remove.h @@ -1,7 +1,7 @@ /** * @file Remove.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &reference, const char *instance_type, Event_Future holder); - + virtual ~Remove_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); private: ::Deployment::DeploymentPlan & plan_; ::CORBA::ULong instanceRef_; ::CORBA::Any reference_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Events/Start.h b/DAnCE/LocalityManager/Scheduler/Events/Start.h index 1e420e8dd1c..3d6ecc0e870 100644 --- a/DAnCE/LocalityManager/Scheduler/Events/Start.h +++ b/DAnCE/LocalityManager/Scheduler/Events/Start.h @@ -1,7 +1,7 @@ /** * @file Start.h * @author William R. Otte <wotte@dre.vanderbilt.edu> - * + * * $Id$ * */ @@ -27,26 +27,26 @@ namespace DAnCE const CORBA::Any &instance_ref, const char *instance_type, Event_Future holder); - + virtual ~Start_Instance (void); protected: virtual void invoke_pre_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void invoke (::DAnCE::InstanceDeploymentHandler_ptr); - + virtual void invoke_post_interceptor (Plugin_Manager::INTERCEPTORS::const_iterator &); - + virtual void create_unexpected_exception (const std::string &, const std::string &); - + virtual void create_valid_result (Event_Result &); - + private: ::Deployment::DeploymentPlan &plan_; ::CORBA::ULong instanceRef_; const CORBA::Any &ref_; - }; + }; } #endif diff --git a/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h b/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h index 52a7d3657b1..ad294799373 100644 --- a/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h +++ b/DAnCE/LocalityManager/Scheduler/Plugin_Manager.h @@ -3,8 +3,8 @@ * @author William R. Otte <wotte@dre.vanderbilt.edu * * $Id$ - * - * Singleton class to manage the lifecycle of deployment + * + * Singleton class to manage the lifecycle of deployment * interceptors and plug-ins. */ @@ -33,18 +33,18 @@ namespace DAnCE { public: Plugin_Manager (void); - + ~Plugin_Manager (void); - + void set_orb (CORBA::ORB_ptr orb); - + CORBA::ORB_ptr get_orb (void); /// Set the configuration of the plugin_manager void set_configuration (const Deployment::Properties &config); - + typedef Dependency_Sorter::IH_DEPS IH_DEPS; - + /// Registers a new installation handler. char * register_installation_handler (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint, @@ -53,24 +53,24 @@ namespace DAnCE /// Registers a new deployment interceptor void register_interceptor (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint); - - + + typedef Dependency_Sorter::Invalid_Install_Order Invalid_Install_Order; typedef Dependency_Sorter::INSTALL_ORDER INSTALL_ORDER; void get_installation_order (INSTALL_ORDER &); - - ::DAnCE::InstanceDeploymentHandler_ptr + + ::DAnCE::InstanceDeploymentHandler_ptr fetch_installation_handler (const char *instance_type); - - typedef std::list < ::DAnCE::DeploymentInterceptor_var > + + typedef std::list < ::DAnCE::DeploymentInterceptor_var > INTERCEPTORS; - + const INTERCEPTORS & fetch_interceptors (void); - + void register_configuration_plugin (const ACE_TCHAR *artifact, const ACE_TCHAR *entrypoint); - + ::DAnCE::LocalityConfiguration_ptr get_configuration_handler (const char *id); @@ -79,21 +79,21 @@ namespace DAnCE typedef std::map < std::string, ::DAnCE::InstanceDeploymentHandler_var > HANDLER_MAP; - + typedef std::map < std::string, LocalityConfiguration_var > CONFIG_MAP; - + HANDLER_MAP handler_map_; - + INTERCEPTORS interceptors_; - + CONFIG_MAP config_plugins_; - + Dependency_Sorter ih_dep_; - + CORBA::ORB_var orb_; }; - + typedef ACE_Singleton <Plugin_Manager, TAO_SYNCH_MUTEX> PLUGIN_MANAGER; } @@ -102,4 +102,4 @@ DEPLOYMENT_SCHEDULER_SINGLETON_DECLARE (ACE_Singleton, DAnCE::Plugin_Manager, TAO_SYNCH_MUTEX) #endif - + diff --git a/DAnCE/NodeApplication/NodeApplication_Impl.h b/DAnCE/NodeApplication/NodeApplication_Impl.h index bd150f865cf..986ab219b6f 100644 --- a/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -42,7 +42,7 @@ namespace DAnCE typedef DAnCE::Split_Plan < DAnCE::Locality_Splitter > LocalitySplitter; class NodeManager_Impl; - + class NodeApplication_Export NodeApplication_Impl : public virtual POA_Deployment::NodeApplication { @@ -69,8 +69,8 @@ namespace DAnCE typedef std::map <std::string, ::DAnCE::LocalityManager_var> LOCALITY_MAP; - - + + typedef std::pair <CORBA::ULong, ::Deployment::DeploymentPlan> SUB_PLAN; typedef std::map <std::string, SUB_PLAN> PLAN_MAP; @@ -87,11 +87,11 @@ namespace DAnCE ACE_CString node_name_; LOCALITY_MAP localities_; - + DAnCE::Deployment_Scheduler scheduler_; PLAN_MAP sub_plans_; - + CORBA::ULong spawn_delay_; }; } diff --git a/DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h b/DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h index ec2d9b7271c..33f4da8089c 100644 --- a/DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h +++ b/DAnCE/Plan_Launcher/Daemon/PL_Daemon_Impl.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1698 #ifndef PL_DAEMONI_SPRPP7_H_ @@ -20,12 +20,12 @@ class Plan_Launcher_Daemon_i : public virtual POA_DAnCE::Plan_Launcher_Daemon { public: - // Constructor + // Constructor Plan_Launcher_Daemon_i (CORBA::ORB_ptr orb); - - // Destructor + + // Destructor virtual ~Plan_Launcher_Daemon_i (void); - + virtual ::Deployment::DeploymentPlan * parse_xml_plan ( const char * plan_location); @@ -33,10 +33,10 @@ public: virtual ::Deployment::DeploymentPlan * parse_cdr_plan ( const char * plan_location); - + virtual void shutdown (void); - + private: CORBA::ORB_var orb_; }; diff --git a/DAnCE/Plan_Launcher/Deployment_Failure.h b/DAnCE/Plan_Launcher/Deployment_Failure.h index bc073921794..50187aaddc7 100644 --- a/DAnCE/Plan_Launcher/Deployment_Failure.h +++ b/DAnCE/Plan_Launcher/Deployment_Failure.h @@ -17,7 +17,7 @@ namespace DAnCE struct Deployment_Failure { Deployment_Failure (const ACE_CString &ex) : ex_ (ex) {} - + ACE_CString ex_; }; } diff --git a/DAnCE/Plan_Launcher/NM_Launcher.h b/DAnCE/Plan_Launcher/NM_Launcher.h index 7730ac8fd73..48b4e0c72e1 100644 --- a/DAnCE/Plan_Launcher/NM_Launcher.h +++ b/DAnCE/Plan_Launcher/NM_Launcher.h @@ -19,7 +19,7 @@ namespace DAnCE { - class DAnCE_Plan_Launcher_Export NM_Launcher : + class DAnCE_Plan_Launcher_Export NM_Launcher : public virtual Plan_Launcher_Base_Impl< ::Deployment::NodeManager, ::Deployment::NodeApplicationManager, ::Deployment::NodeApplication > @@ -27,14 +27,14 @@ namespace DAnCE typedef Plan_Launcher_Base_Impl< ::Deployment::NodeManager, ::Deployment::NodeApplicationManager, ::Deployment::NodeApplication > __Base; - + public: NM_Launcher (CORBA::ORB_ptr orb, __Base::Manager_ptr managerw); - + ~NM_Launcher (void); - - + + }; } diff --git a/DAnCE/Plan_Launcher/Plan_Launcher_Base.h b/DAnCE/Plan_Launcher/Plan_Launcher_Base.h index 024556fc324..7ae51ff7411 100644 --- a/DAnCE/Plan_Launcher/Plan_Launcher_Base.h +++ b/DAnCE/Plan_Launcher/Plan_Launcher_Base.h @@ -20,38 +20,38 @@ namespace DAnCE { public: virtual ~Plan_Launcher_Base (void) {}; - + /// Fully launches a nominated plan, returning valid object references to - /// the ApplicationManager and Application objects if successful. + /// the ApplicationManager and Application objects if successful. virtual const char * launch_plan (const ::Deployment::DeploymentPlan &plan, CORBA::Object_out am, CORBA::Object_out app) = 0; - + /// Invokes prepareplan for the provided plan, returning a reference to - /// the ApplicationManager. + /// the ApplicationManager. virtual CORBA::Object_ptr prepare_plan (const ::Deployment::DeploymentPlan &plan) = 0; - + /// Invokes startLaunch on the provided ApplicationManager reference. virtual CORBA::Object_ptr start_launch (CORBA::Object_ptr app_mgr, const ::Deployment::Properties &properties, ::Deployment::Connections_out connections) = 0; - - /// Invokes finishLaunch on the provided Application reference. + + /// Invokes finishLaunch on the provided Application reference. virtual void finish_launch (CORBA::Object_ptr application, const ::Deployment::Connections &provided_connections, bool start) = 0; - - /// Invokes start on the provided application reference. + + /// Invokes start on the provided application reference. virtual void start (CORBA::Object_ptr application) = 0; - + /// Tears down a plan given an applicationmanafger and Application - /// reference pair. + /// reference pair. virtual void teardown_application (CORBA::Object_ptr app_mgr, CORBA::Object_ptr app) = 0; - - /// Instructs the Manager to destroy the ApplicationManager. + + /// Instructs the Manager to destroy the ApplicationManager. virtual void destroy_app_manager (CORBA::Object_ptr app_mgr) = 0; - + /// Helper method to resolve externalReference endpoints into valid object references. virtual void create_external_connections(const ::Deployment::DeploymentPlan &plan, Deployment::Connections &conn) = 0; diff --git a/DAnCE/tools/Completion/Completion_Counter_Base.h b/DAnCE/tools/Completion/Completion_Counter_Base.h index 3b3d914e12b..35ab827736e 100644 --- a/DAnCE/tools/Completion/Completion_Counter_Base.h +++ b/DAnCE/tools/Completion/Completion_Counter_Base.h @@ -37,7 +37,7 @@ namespace DAnCE Completion_Counter_Base (unsigned int exec_count, unsigned int fail_count); virtual ~Completion_Counter_Base (); - + void decrement_exec_count (); void increment_fail_count (const char* error); @@ -45,7 +45,7 @@ namespace DAnCE unsigned int fail_count (); bool all_completed (); - + const errors_type& errors () const; protected: diff --git a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h index 7499d82eae0..ccc0dce2547 100644 --- a/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h +++ b/DAnCE/tools/System_Health/Daemon/SHS_Daemon_Impl.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_codegen.cpp:1698 #ifndef SHS_DAEMONI_SPRPP7_H_ @@ -19,20 +19,20 @@ namespace DAnCE : public virtual POA_DAnCE::SHS::SHS_Daemon { public: - // Constructor + // Constructor SHS_Daemon_i (CORBA::ORB_ptr orb); - - // Destructor + + // Destructor virtual ~SHS_Daemon_i (void); - + virtual void update ( const ::DAnCE::SHS::Status_Update & update); - + virtual void shutdown (void); - - private: + + private: CORBA::ORB_var orb_; }; } diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h index 2ca9074f0cb..a79ba95eee1 100644 --- a/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h +++ b/DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h @@ -16,16 +16,16 @@ namespace DAnCE { namespace SHS { - class DAnCE_SHS_CORBA_Transport_Export SHS_CORBA_Transport : + class DAnCE_SHS_CORBA_Transport_Export SHS_CORBA_Transport : public virtual SHS_Transport { public: SHS_CORBA_Transport (void); - + virtual ~SHS_CORBA_Transport (void); - + virtual void configure (const Deployment::Properties &); - + virtual void push_event (const Status_Update &update); private: DAnCE::SHS::SHS_Daemon_var shs_daemon_; diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h index f8a2455ab0a..abfc872b4c1 100644 --- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h +++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.h @@ -27,13 +27,13 @@ namespace DAnCE : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor - + // Constructor + SHS_Interceptor (void); - - // Destructor + + // Destructor virtual ~SHS_Interceptor (void); - + virtual void post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong index, @@ -50,17 +50,17 @@ namespace DAnCE void post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, @@ -73,7 +73,7 @@ namespace DAnCE ::CORBA::ULong index, const ::CORBA::Any & exception_thrown, const char *error); - + private: auto_ptr <DAnCE::SHS::SHS_Transport> shs_transport_; }; @@ -81,7 +81,7 @@ namespace DAnCE extern "C" { - ::DAnCE::DeploymentInterceptor_ptr + ::DAnCE::DeploymentInterceptor_ptr DAnCE_SHS_Interceptors_Export create_DAnCE_SHS_Interceptor (void); } diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h index b7a5d6df1bb..6d17e3ad83c 100644 --- a/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h +++ b/DAnCE/tools/System_Health/Interceptors/SHS_Transport.h @@ -24,7 +24,7 @@ namespace DAnCE virtual ~SHS_Transport (void) {} virtual void configure (const Deployment::Properties &) = 0; - + virtual void push_event (const Status_Update &update) = 0; }; } diff --git a/DAnCE/tools/XML/XML_Helper.h b/DAnCE/tools/XML/XML_Helper.h index 9856a267e0d..d57210e0959 100644 --- a/DAnCE/tools/XML/XML_Helper.h +++ b/DAnCE/tools/XML/XML_Helper.h @@ -74,9 +74,9 @@ namespace DAnCE /// Terminate the parser void terminate_parser (void); - + Resolver &get_resolver (void); - + Error_Handler &get_error_handler (void); protected: diff --git a/DAnCE/tools/XML/XML_Schema_Resolver.h b/DAnCE/tools/XML/XML_Schema_Resolver.h index 4d860a6614f..48e46f9d7fa 100644 --- a/DAnCE/tools/XML/XML_Schema_Resolver.h +++ b/DAnCE/tools/XML/XML_Schema_Resolver.h @@ -51,7 +51,7 @@ namespace DAnCE /// actually resolve the location of a schema. virtual InputSource * resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId); - + Resolver &get_resolver (void); private: diff --git a/DAnCE/tools/XML/XercesString.h b/DAnCE/tools/XML/XercesString.h index 41b56abe44e..0b43bc9c6d0 100644 --- a/DAnCE/tools/XML/XercesString.h +++ b/DAnCE/tools/XML/XercesString.h @@ -31,7 +31,7 @@ namespace DAnCE XStr() : _wstr(0L) { }; // On unicode windows, ACE_TCHAR == XMLCh -#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR) +#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR) XStr (const ACE_TCHAR* str); #endif @@ -60,9 +60,9 @@ namespace DAnCE XMLCh operator [] (const int i) const; operator const XMLCh* () const { return _wstr; }; - + XMLCh * release (void); - + /// Release the held string and free its memory. void reset (void); private: |