diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-04 12:30:14 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-04 12:30:14 +0000 |
commit | 41835f3d87e91d13fbc0c31dd451f4e4331d1c75 (patch) | |
tree | 839a736a790e3010cd74f27a846ced3c324e9f7c | |
parent | 8f7010c04b7e30bbc704534d15abc81b5bc7247e (diff) | |
download | ATCD-41835f3d87e91d13fbc0c31dd451f4e4331d1c75.tar.gz |
Wed Nov 4 11:30:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h
* DAnCE/DomainApplication/Domain_Application_Impl.h
* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
* DAnCE/DomainApplicationManager/Node_Locator.h
* DAnCE/ExecutionManager/ExecutionManager_Impl.h
* DAnCE/ExecutionManager/ExecutionManager_Module.h
* DAnCE/NodeApplication/ComponentAttributesSetter.h
* DAnCE/NodeApplication/NodeApplication_Impl.h
* DAnCE/NodeApplication/ServerActivator_Impl.h
* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
* DAnCE/NodeManager/Node_Manager_Module.h
* DAnCE/NodeManager/NodeManager_Impl.h
* DAnCE/Plan_Launcher/Plan_Launcher.h
* DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h
* DAnCE/Plan_Launcher/Plan_Launcher_Module.h
* DAnCE/RepositoryManager/Repository_Manager_Module.h
* DAnCE/Starter/Starter.cpp
* DAnCE/TargetManager/Target_Manager_Module.h
* DAnCE/Utils/Plan_Handler.h
Doxygen fixes
21 files changed, 68 insertions, 44 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7304a7691fd..35d132cbb9c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,26 @@ +Wed Nov 4 11:30:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h + * DAnCE/DomainApplication/Domain_Application_Impl.h + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h + * DAnCE/DomainApplicationManager/Node_Locator.h + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/ExecutionManager/ExecutionManager_Module.h + * DAnCE/NodeApplication/ComponentAttributesSetter.h + * DAnCE/NodeApplication/NodeApplication_Impl.h + * DAnCE/NodeApplication/ServerActivator_Impl.h + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h + * DAnCE/NodeManager/Node_Manager_Module.h + * DAnCE/NodeManager/NodeManager_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h + * DAnCE/Plan_Launcher/Plan_Launcher_Module.h + * DAnCE/RepositoryManager/Repository_Manager_Module.h + * DAnCE/Starter/Starter.cpp + * DAnCE/TargetManager/Target_Manager_Module.h + * DAnCE/Utils/Plan_Handler.h + Doxygen fixes + Wed Nov 4 11:16:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/ComponentServer/CIAO_ComponentServer.cpp: diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h index 69dea848e0b..4d6a848e8f8 100644 --- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h +++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h @@ -3,7 +3,7 @@ * * @file Domain_Application_Impl.h * - * @Brief This file contains the implementation of + * @brief This file contains the implementation of * the DomainApplication interface. * * @author Vinzenz Tornow <vt@prismtech.com> diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h index a3c7fc91781..80f9c15577e 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of POA_Deployment::DomainApplicationManager + * @brief Implementation of POA_Deployment::DomainApplicationManager * * @author Erwin Gottlieb <eg@prismtech.com> */ diff --git a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h index f3255d0c230..0708ef2b911 100644 --- a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h +++ b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Locates NodeManager instances. + * @brief Locates NodeManager instances. * * @author William R. Otte <wotte@dre.vanderbilt.edu> */ diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h index e8247c744fe..544e17ac431 100644 --- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h +++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of Deployment::ExecutionManager and POA_DAnCE::ExecutionManagerDaemon + * @brief Implementation of Deployment::ExecutionManager and POA_DAnCE::ExecutionManagerDaemon * * @author Erwin Gottlieb <eg@prismtech.com> */ @@ -55,11 +55,11 @@ namespace DAnCE // This one derived from ExecutionManagerDaemon interface // for shutdowning DAnCE agent virtual void shutdown (); - + void add_node_manager (const ACE_TCHAR *name, const ACE_TCHAR *ior); void load_node_map (const ACE_TCHAR *filename); - + private: CORBA::ORB_var orb_; PortableServer::POA_var poa_; diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h index 30688be2632..eebe3f5f52a 100644 --- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h +++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief + * @brief * * @author Vinzenz Tornow <vt@prismtech.com> */ diff --git a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.h b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.h index dba5a723a50..06b125ad559 100644 --- a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.h +++ b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Workaround for component attributes setting + * @brief Workaround for component attributes setting * * @author Erwin Gottlieb <eg@prismtech.com> */ diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h index b2e5b3cdb66..b40fe03d446 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of Deployment::NodeApplication + * @brief Implementation of Deployment::NodeApplication * * @author Erwin Gottlieb <eg@prismtech.com> * @author William R. Otte <wotte@dre.vanderbilt.edu> @@ -154,11 +154,11 @@ namespace DAnCE void create_config_values(const ::Deployment::Properties& prop, Components::ConfigValues& cfg) const; - + typedef std::map <std::string, int> ColocationMap; - - /// Creates colocation groups for all components in this node's deployment. - /// Resulting map has mappings of component ids to appropriate server. + + /// Creates colocation groups for all components in this node's deployment. + /// Resulting map has mappings of component ids to appropriate server. /// As a postcondition, the size of the servers_ array is increased appropriately. ColocationMap create_colocation_groups (void); diff --git a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h b/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h index 8ce81ca1db6..b0a54087b35 100644 --- a/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h +++ b/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of Deployment::ServerActivator + * @brief Implementation of Deployment::ServerActivator * * @author Erwin Gottlieb <eg@prismtech.com> */ diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index 22add49ee62..0df4ec15d52 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of POA_Deployment::NodeApplicationManager + * @brief Implementation of POA_Deployment::NodeApplicationManager * * @author Erwin Gottlieb <eg@prismtech.com> */ diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h index 7e35b279fbd..2afc4be7a47 100644 --- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h +++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Implementation of POA_Deployment::NodeManager + * @brief Implementation of POA_Deployment::NodeManager * * @author Erwin Gottlieb <eg@prismtech.com> * @author William R. Otte <wotte@dre.vanderbilt.edu> diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h index 2b87bf1bcfc..489a96195a7 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h +++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief To start NodeManager by starter + * @brief To start NodeManager by starter * * @author Vinzenz Tornow <vt@prismtech.com> * @author William R. Otte <wotte@dre.vanderbilt.edu> diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h index 2fb68fe1110..5a65dd9df9f 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Run PlanLauncher + * @brief Run PlanLauncher * * @author Vinzenz Tornow <vt@prismtech.com> */ diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h index 308ae3c3c00..92c6036aa9e 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Uses to run PlanLauncher from starter + * @brief Uses to run PlanLauncher from starter * * @author Vinzenz Tornow <vt@prismtech.com> */ diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h index d4a937ecd98..cc80534de9a 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Uses to run PlanLauncher from starter + * @brief Uses to run PlanLauncher from starter * * @author Vinzenz Tornow <vt@prismtech.com> */ diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h index 18a149e5e21..5374ad6f00f 100644 --- a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h +++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief To start RepositoryManager by starter + * @brief To start RepositoryManager by starter * * @author Vinzenz Tornow <vt@prismtech.com> * @author William R. Otte <wotte@dre.vanderbilt.edu> @@ -60,14 +60,14 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module const ACE_TCHAR * package_dir_; const ACE_TCHAR * name_; const ACE_TCHAR * server_address_; - + bool spawn_http_; const ACE_TCHAR *http_port_; const ACE_TCHAR *http_threads_; const ACE_TCHAR *http_threading_; const ACE_TCHAR *http_io_; const ACE_TCHAR *http_caching_; - + SOptions() : domain_nc_ (0), ior_file_ (0), @@ -102,14 +102,14 @@ class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module private: void create_poas (void); - + void spawn_http (void); - + /// Here we store the servants. typedef ACE_Map_Manager < ACE_CString, DAnCE::RepositoryManagerDaemon_i *, ACE_Null_Mutex > Servant_Map; - + Servant_Map rm_map_; CORBA::ORB_var orb_; diff --git a/CIAO/DAnCE/Starter/Starter.cpp b/CIAO/DAnCE/Starter/Starter.cpp index 0f031b4afaf..d17d8f1dcda 100644 --- a/CIAO/DAnCE/Starter/Starter.cpp +++ b/CIAO/DAnCE/Starter/Starter.cpp @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Dynamically runs libraries + * @brief Dynamically runs libraries * * @author Vinzenz Tornow <vt@prismtech.com> */ diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h index cc75a98a29c..83a598c7934 100644 --- a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h +++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief To start TargetManager by starter + * @brief To start TargetManager by starter * * @author William R. Otte <wotte@dre.vanderbilt.edu> */ @@ -53,7 +53,7 @@ class DAnCE_TargetManager_Module_Export DAnCE_TargetManager_Module const ACE_TCHAR * ior_file_; const ACE_TCHAR * domain_descr_; const ACE_TCHAR * name_; - + SOptions() : domain_nc_ (0), ior_file_ (0), @@ -81,12 +81,12 @@ class DAnCE_TargetManager_Module_Export DAnCE_TargetManager_Module private: void create_poas (void); - + /// Here we store the servants. typedef ACE_Map_Manager < ACE_CString, DAnCE::TargetManagerDaemon_i *, ACE_Null_Mutex > Servant_Map; - + Servant_Map rm_map_; CORBA::ORB_var orb_; diff --git a/CIAO/DAnCE/Utils/Plan_Handler.h b/CIAO/DAnCE/Utils/Plan_Handler.h index ce04462695e..591853b68a6 100644 --- a/CIAO/DAnCE/Utils/Plan_Handler.h +++ b/CIAO/DAnCE/Utils/Plan_Handler.h @@ -3,7 +3,7 @@ * * @file Plan_Handler.h * - * @Brief This file contains the implementation of + * @brief This file contains the implementation of * the Plan_Handler class. * * @author Gan Deng <gan.deng@vanderbilt.edu> @@ -28,7 +28,7 @@ namespace DAnCE * can modify the deployment plan internals. * * The main methods on this class are: - * + * * - Add a instance to the deployment plan; * - Add a connection to the deployment plan; * - Remove a connection from the deployment plan; @@ -42,25 +42,25 @@ namespace DAnCE { public: static void add_instance ( - ::Deployment::DeploymentPlan &deployment_plan, - const char *instance_name, - const char *node_name, - const char *impl_name, + ::Deployment::DeploymentPlan &deployment_plan, + const char *instance_name, + const char *node_name, + const char *impl_name, const char *ns_name = 0); static void add_connection ( - ::Deployment::DeploymentPlan &deployment_plan, - const char *connection_name, - const char *port_name, - const char *facet_instance, + ::Deployment::DeploymentPlan &deployment_plan, + const char *connection_name, + const char *port_name, + const char *facet_instance, const char *receptacle_instance); static void remove_instance ( - ::Deployment::DeploymentPlan &deployment_plan, + ::Deployment::DeploymentPlan &deployment_plan, const char *instance_name); static void remove_connection ( - ::Deployment::DeploymentPlan &deployment_plan, + ::Deployment::DeploymentPlan &deployment_plan, const char *connection_name); static void print_instances ( diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h index 9175bb8353a..699a3bd4369 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h @@ -6,7 +6,7 @@ * * $Id$ * - * @Brief Return location of component artifact + * @brief Return location of component artifact * * @author Erwin Gottlieb <eg@prismtech.com> */ diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc index 5210b6e47e2..f3234945984 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc @@ -1,4 +1,5 @@ // $Id$ + project(CIAO_ComponentServer_IDL) : ciaoidldefaults, anytypecode { idlflags += -Wb,stub_export_macro=CIAO_COMPONENTSERVER_STUB_Export \ -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h \ |